aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Tobler <a.tobler@schweiz.ch>2005-06-02 20:12:47 +0200
committerAndreas Tobler <andreast@gcc.gnu.org>2005-06-02 20:12:47 +0200
commit423ceeadf1fe2c682f75e11e6d860bcdea1879fa (patch)
tree9a126e0b49ab3a70001bc25ead84a4a0996d339e
parentc1bd2d6675c9ef4eee8af1ded66b32f9238ef5eb (diff)
downloadgcc-423ceeadf1fe2c682f75e11e6d860bcdea1879fa.zip
gcc-423ceeadf1fe2c682f75e11e6d860bcdea1879fa.tar.gz
gcc-423ceeadf1fe2c682f75e11e6d860bcdea1879fa.tar.bz2
jawt.c: Remove malloc.h, covered by stdlib.h.
2005-06-03 Andreas Tobler <a.tobler@schweiz.ch> * jawt.c: Remove malloc.h, covered by stdlib.h. * testsuite/libjava.jni/jni.exp (gcj_jni_invocation_compile_c_to_binary): Add -bind_at_load to silence the build process. From-SVN: r100504
-rw-r--r--libjava/ChangeLog8
-rw-r--r--libjava/jawt.c1
-rw-r--r--libjava/testsuite/libjava.jni/jni.exp2
3 files changed, 9 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 44df231..a98920a 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-03 Andreas Tobler <a.tobler@schweiz.ch>
+
+ * jawt.c: Remove malloc.h, covered by stdlib.h.
+
+ * testsuite/libjava.jni/jni.exp
+ (gcj_jni_invocation_compile_c_to_binary): Add -bind_at_load to silence
+ the build process.
+
2005-06-02 Keith Seitz <keiths@redhat.com>
* gnu/classpath/jdwp/transport/TransportException.java: New file.
diff --git a/libjava/jawt.c b/libjava/jawt.c
index bb03c63..ad5284d 100644
--- a/libjava/jawt.c
+++ b/libjava/jawt.c
@@ -40,7 +40,6 @@
#include <jawt.h>
#include <jawt_md.h>
#include "classpath_jawt.h"
-#include <malloc.h>
static jint (JNICALL _Jv_Lock) (JAWT_DrawingSurface* surface);
static void (JNICALL _Jv_Unlock) (JAWT_DrawingSurface* surface);
diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index 201daac..8461426 100644
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -196,7 +196,7 @@ proc gcj_jni_invocation_compile_c_to_binary {file {options {}}} {
# Set some darwin specific options
if { [istarget "*-*-darwin*"] } {
- lappend options "additional_flags=-multiply_defined suppress"
+ lappend options "additional_flags= -bind_at_load -multiply_defined suppress"
}
# Find the generated header.
lappend options "additional_flags=-I. -I.."