* java/lang/Object.h (_JvObjectPrefix): Declare as extern "Java".

From-SVN: r95405

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 324a5b23b7d0d49d51726fdaeeef5f0397e46ac9..cb31732b2d4eb20f1acbc6fb1dbcfd85637d325c 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-22  Tom Tromey  <tromey@redhat.com>
+
+       * java/lang/Object.h (_JvObjectPrefix): Declare as extern "Java".
+
 2005-02-22  Tom Tromey  <tromey@redhat.com>
 
        PR java/20056:

diff --git a/libjava/java/lang/Object.h b/libjava/java/lang/Object.h
index 0842e0b291c12a308086dc9ae986bfa190e5dfa5..bf68a72399b4546224cd9f71d640deda99216264 100644 (file)
--- a/libjava/java/lang/Object.h
+++ b/libjava/java/lang/Object.h
@@ -1,6 +1,6 @@
 // Object.h - Header file for java.lang.Object.  -*- c++ -*-
 
-/* Copyright (C) 1998, 1999, 2000, 2001, 2004  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2001, 2004, 2005  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -15,6 +15,8 @@ details.  */
 
 #include <gcj/javaprims.h>
 
+extern "Java"
+{
 // This class is mainly here as a kludge to get G++ to allocate two
 // extra entries in each vtable.
 struct _JvObjectPrefix
@@ -27,6 +29,7 @@ protected:
     virtual void nacd_2 (void) {}; // Actually the GC bitmap marking descriptor.
 # endif
 };
+}
 
 // Forward declarations for friends of java::lang::Object
 void _Jv_MonitorEnter (jobject obj);