diff options
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/gnu/gcj/runtime/natSharedLibLoader.cc | 17 |
2 files changed, 17 insertions, 6 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 04695cbde96..87ef89dfb4f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2006-04-25 Tom Tromey <tromey@redhat.com> + + * gnu/gcj/runtime/natSharedLibLoader.cc: Include gc.h later. + Include platform.h. Set GC_DEBUG before including gc.h, if + needed. + 2006-04-25 Andrew Haley <aph@redhat.com> * java/lang/natClassLoader.cc: Don't include link.h or dladdr.h. diff --git a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc index 95d2d8ea7a0..fcff8f200b4 100644 --- a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc +++ b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc @@ -1,6 +1,6 @@ // natSharedLibLoader.cc - Implementation of SharedLibHelper native methods. -/* Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation +/* Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation This file is part of libgcj. @@ -9,11 +9,7 @@ Libgcj License. Please consult the file "LIBGCJ_LICENSE" for details. */ #include <config.h> - -// If we're using the Boehm GC, then we need this include to override dlopen. -#ifdef HAVE_BOEHM_GC -#include <gc.h> -#endif /* HAVE_BOEHM_GC */ +#include <platform.h> #include <gcj/cni.h> #include <jvm.h> @@ -24,6 +20,15 @@ details. */ #include <java/lang/UnsupportedOperationException.h> #include <java/lang/UnknownError.h> +// If we're using the Boehm GC, then we need this include to override dlopen. +#ifdef HAVE_BOEHM_GC +// Set GC_DEBUG before including gc.h! +#ifdef LIBGCJ_GC_DEBUG +# define GC_DEBUG +#endif +#include <gc.h> +#endif /* HAVE_BOEHM_GC */ + #ifdef HAVE_DLOPEN #include <dlfcn.h> |