summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2005-01-02 03:35:57 +0000
committerbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2005-01-02 03:35:57 +0000
commita26ec131de46b70ed736ae85d4ec16f1c1b57b1d (patch)
tree3d578519fc9cb151022d0814800672bd94732b72 /libjava
parent2346c40ce25f13a90a1d691dfa18177abbc121f4 (diff)
downloadgcc-a26ec131de46b70ed736ae85d4ec16f1c1b57b1d.tar.gz
2005-01-01 Bryce McKinlay <mckinlay@redhat.com>
* include/boehm-gc.h: Include gc_ext_config.h, not gc_config.h. 2005-01-01 Bryce McKinlay <mckinlay@redhat.com> * configure.ac (AC_CONFIG_HEADERS): Build both include/gc_config.h and include/gc_ext_config.h. * include/gc_ext_config.h: New file. Define only THREAD_LOCAL_ALLOC. * include/gc.h: Undef PACKAGE_* before including gc_config.h. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@92801 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog4
-rw-r--r--libjava/include/boehm-gc.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0ea15994a06..8ad5dbfe0f6 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-01 Bryce McKinlay <mckinlay@redhat.com>
+
+ * include/boehm-gc.h: Include gc_ext_config.h, not gc_config.h.
+
2004-12-31 Andreas Jaeger <aj@suse.de>
* testsuite/lib/libjava.exp (libjava_find_gij): Handle multilibs.
diff --git a/libjava/include/boehm-gc.h b/libjava/include/boehm-gc.h
index 61e007ff501..e7802b68035 100644
--- a/libjava/include/boehm-gc.h
+++ b/libjava/include/boehm-gc.h
@@ -26,7 +26,7 @@ extern "C"
#include <java/lang/Class.h>
#include <string.h>
-#include <gc_config.h>
+#include <gc_ext_config.h> // for THREAD_LOCAL_ALLOC
extern "C" void * GC_gcj_malloc(size_t, void *);
extern "C" void * GC_malloc_atomic(size_t);