diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rwxr-xr-x | libjava/configure | 5 | ||||
| -rw-r--r-- | libjava/configure.in | 7 | ||||
| -rw-r--r-- | libjava/include/boehm-gc.h | 2 |
4 files changed, 12 insertions, 9 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7193883..6a73f1b 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,12 @@ 2004-08-13 Bryce McKinlay <mckinlay@redhat.com> + * configure.in (GCINCS): Don't use "boehm-cflags". Instead, -I + boehm-gc's include dirs. + * configure: Rebuilt. + * include/boehm-gc.h: Include gc_config.h. + +2004-08-13 Bryce McKinlay <mckinlay@redhat.com> + * java/net/InetAddress.java (loopbackAddress): Renamed from localhostAddress. (getByName): Return loopback address for null hostname, without diff --git a/libjava/configure b/libjava/configure index 9aab57a..79926dd 100755 --- a/libjava/configure +++ b/libjava/configure @@ -7481,10 +7481,7 @@ echo "${ECHO_T}boehm" >&6 GCLIBS=../boehm-gc/libgcjgc_convenience.la JC1GCSPEC='-fuse-boehm-gc' GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs" - - # We also want to pick up some cpp flags required when including - # boehm-config.h. Yuck. - GCINCS="`cat ../boehm-gc/boehm-cflags`" + GCINCS='-I$(top_srcdir)/../boehm-gc/include -I../boehm-gc/include' GCOBJS=boehm.lo GCHDR=boehm-gc.h # The POSIX thread support needs to know this. diff --git a/libjava/configure.in b/libjava/configure.in index 427e21e..fcc7094 100644 --- a/libjava/configure.in +++ b/libjava/configure.in @@ -579,11 +579,8 @@ case "$GC" in GCLIBS=../boehm-gc/libgcjgc_convenience.la JC1GCSPEC='-fuse-boehm-gc' GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs" - - # We also want to pick up some cpp flags required when including - # boehm-config.h. Yuck. - GCINCS="`cat ../boehm-gc/boehm-cflags`" - GCOBJS=boehm.lo + GCINCS='-I$(top_srcdir)/../boehm-gc/include -I../boehm-gc/include' + GCOBJS=boehm.lo GCHDR=boehm-gc.h # The POSIX thread support needs to know this. AC_DEFINE(HAVE_BOEHM_GC, 1, [Define if Boehm GC in use.]) diff --git a/libjava/include/boehm-gc.h b/libjava/include/boehm-gc.h index 509900c..4e0065f 100644 --- a/libjava/include/boehm-gc.h +++ b/libjava/include/boehm-gc.h @@ -26,6 +26,8 @@ extern "C" #include <java/lang/Class.h> #include <string.h> +#include <gc_config.h> + extern "C" void * GC_gcj_malloc(size_t, void *); extern "C" void * GC_malloc_atomic(size_t); #ifdef THREAD_LOCAL_ALLOC |