OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Tom Tromey 2006-04-25 15:20:33 +00:00 committed by Tom Tromey
parent d5fa3ec8dc
commit 1f263074ea
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -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.

17
libjava/gnu/gcj/runtime/natSharedLibLoader.cc
View File

@ -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>