diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-04-20 23:47:56 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-04-20 23:47:56 +0000 |
| commit | f41edd347189c9f1842e6d9af50ad980d9e723fb (patch) | |
| tree | 794f6b5b1f84cb2619b01d7c693fcac6e98c7fec | |
| parent | d605c7ef2e22789f34c7c4177bdc83db0a8d7b8d (diff) | |
| download | gcc-f41edd347189c9f1842e6d9af50ad980d9e723fb.tar.gz | |
PR libgcj/27170
* gnu/gcj/runtime/natSharedLibLoader.cc: Include gc.h to override
dlopen(). From Anthony Green.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113123 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/gnu/gcj/runtime/natSharedLibLoader.cc | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 215ea00f808..428dede3fc0 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2004-04-20 Bryce McKinlay <mckinlay@redhat.com> + + PR libgcj/27170 + * gnu/gcj/runtime/natSharedLibLoader.cc: Include gc.h to override + dlopen(). From Anthony Green. + 2006-04-20 Tom Tromey <tromey@redhat.com> PR libgcj/21941: diff --git a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc index 90ed1d72d68..95d2d8ea7a0 100644 --- a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc +++ b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc @@ -10,6 +10,11 @@ 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 <gcj/cni.h> #include <jvm.h> #include <execution.h> |