aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/include/java-interp.h4
2 files changed, 8 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6278cb6..3b6404b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-21 Tom Tromey <tromey@redhat.com>
+
+ * include/java-interp.h (_Jv_InterpClass): Use JV_MARKOBJ_DECL.
+ From Corey Minyard.
+
2001-06-19 Mark J. Roberts <mjr@statesmean.com>
* java/math/BigInteger.java (byteArrayToIntArray): Don't include
diff --git a/libjava/include/java-interp.h b/libjava/include/java-interp.h
index ebf958b..233e738 100644
--- a/libjava/include/java-interp.h
+++ b/libjava/include/java-interp.h
@@ -158,7 +158,9 @@ class _Jv_InterpClass : public java::lang::Class
friend class _Jv_InterpMethod;
friend void _Jv_PrepareClass(jclass);
friend void _Jv_InitField (jobject, jclass, int);
- friend void* _Jv_MarkObj (void *, void *, void *, void *);
+#ifdef JV_MARKOBJ_DECL
+ friend JV_MARKOBJ_DECL;
+#endif
friend _Jv_MethodBase ** _Jv_GetFirstMethod (_Jv_InterpClass *klass);
};