From: Bryce McKinlay Date: Wed, 19 Dec 2001 01:59:28 +0000 (+0000) Subject: jvm.h (_Jv_BuildGCDescr): Declare unconditionally. X-Git-Tag: prereleases/libstdc++-3.0.95~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=726abf5d79aeafa36473c865033fa7a97358fded;p=thirdparty%2Fgcc.git jvm.h (_Jv_BuildGCDescr): Declare unconditionally. * include/jvm.h (_Jv_BuildGCDescr): Declare unconditionally. * nogc.cc (_Jv_BuildGCDescr): Define unconditionally. From-SVN: r48169 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 51a2404ab370..833491565fbb 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2001-12-19 Bryce McKinlay + + * include/jvm.h (_Jv_BuildGCDescr): Declare unconditionally. + * nogc.cc (_Jv_BuildGCDescr): Define unconditionally. + 2001-12-18 Tom Tromey * java/text/CollationElementIterator.java (secondaryOrder): Cast diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h index bef5b1833ebb..c505a72e6d02 100644 --- a/libjava/include/jvm.h +++ b/libjava/include/jvm.h @@ -177,9 +177,7 @@ void _Jv_InitGC (void); /* Register a finalizer. */ void _Jv_RegisterFinalizer (void *object, _Jv_FinalizerFunc *method); /* Compute the GC descriptor for a class */ -#ifdef INTERPRETER void * _Jv_BuildGCDescr(jclass); -#endif /* Allocate some unscanned, unmoveable memory. Return NULL if out of memory. */ diff --git a/libjava/nogc.cc b/libjava/nogc.cc index daf279c8f855..5d976ef854a2 100644 --- a/libjava/nogc.cc +++ b/libjava/nogc.cc @@ -19,13 +19,11 @@ details. */ // Total amount of memory allocated. static long total = 0; -#ifdef INTERPRETER void * _Jv_BuildGCDescr(jclass klass) { return 0; } -#endif void * _Jv_AllocObj (jsize size, jclass klass)