natSharedLibLoader.cc: Include gc.h later.

	* gnu/gcj/runtime/natSharedLibLoader.cc: Include gc.h later.
	Include platform.h.  Set GC_DEBUG before including gc.h, if
	needed.

From-SVN: r113251

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 04695cbde965af56e3134ee7317c1cb3a6a8bc09..87ef89dfb4fdddc1e6bbfc76e3994e72bf734509 100644 (file)
--- 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 95d2d8ea7a02e74822b6bd80dcba0ef3c1f0e7be..fcff8f200b49912f039ae35f6184f06d46727b49 100644 (file)
--- 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>