diff options
| author | Bryce McKinlay <bryce@waitaki.otago.ac.nz> | 2001-12-19 01:59:28 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2001-12-19 01:59:28 +0000 |
| commit | 726abf5d79aeafa36473c865033fa7a97358fded (patch) | |
| tree | 74d202ac66077231a76b432d682d773ef9e2af70 | |
| parent | 6510f4c98e33e0aac8d5ccb40c680b077ce7aa1b (diff) | |
| download | gcc-726abf5d79aeafa36473c865033fa7a97358fded.tar.gz | |
jvm.h (_Jv_BuildGCDescr): Declare unconditionally.
* include/jvm.h (_Jv_BuildGCDescr): Declare unconditionally.
* nogc.cc (_Jv_BuildGCDescr): Define unconditionally.
From-SVN: r48169
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/include/jvm.h | 2 | ||||
| -rw-r--r-- | libjava/nogc.cc | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 51a2404ab37..833491565fb 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2001-12-19 Bryce McKinlay <bryce@waitaki.otago.ac.nz> + + * include/jvm.h (_Jv_BuildGCDescr): Declare unconditionally. + * nogc.cc (_Jv_BuildGCDescr): Define unconditionally. + 2001-12-18 Tom Tromey <tromey@redhat.com> * java/text/CollationElementIterator.java (secondaryOrder): Cast diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h index bef5b1833eb..c505a72e6d0 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 daf279c8f85..5d976ef854a 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) |