aboutsummaryrefslogtreecommitdiff
path: root/libjava/gnu
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2006-04-25 15:20:33 +0000
committerTom Tromey <tromey@gcc.gnu.org>2006-04-25 15:20:33 +0000
commit1f263074ea1e2b76688d2beaedf997d8a2f76522 (patch)
tree8555284ef3d64415b9cb9ded6ebcf5ecfd646283 /libjava/gnu
parentd5fa3ec8dc165b8b174ee2ccc59fc3fba8a84ee5 (diff)
downloadgcc-1f263074ea1e2b76688d2beaedf997d8a2f76522.zip
gcc-1f263074ea1e2b76688d2beaedf997d8a2f76522.tar.gz
gcc-1f263074ea1e2b76688d2beaedf997d8a2f76522.tar.bz2
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
Diffstat (limited to 'libjava/gnu')
-rw-r--r--libjava/gnu/gcj/runtime/natSharedLibLoader.cc17
1 files changed, 11 insertions, 6 deletions
diff --git a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc
index 95d2d8e..fcff8f2 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>