OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
From-SVN: r95405
This commit is contained in:
Tom Tromey 2005-02-22 18:29:43 +00:00 committed by Tom Tromey
parent 84b6a4d217
commit af43b1adeb
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libjava/ChangeLog
View File

@ -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> 2005-02-22 Tom Tromey <tromey@redhat.com>
PR java/20056: PR java/20056:

5
libjava/java/lang/Object.h
View File

@ -1,6 +1,6 @@
// Object.h - Header file for java.lang.Object. -*- c++ -*- // 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. This file is part of libgcj.
@ -15,6 +15,8 @@ details. */
#include <gcj/javaprims.h> #include <gcj/javaprims.h>
extern "Java"
{
// This class is mainly here as a kludge to get G++ to allocate two // This class is mainly here as a kludge to get G++ to allocate two
// extra entries in each vtable. // extra entries in each vtable.
struct _JvObjectPrefix struct _JvObjectPrefix
@ -27,6 +29,7 @@ protected:
virtual void nacd_2 (void) {}; // Actually the GC bitmap marking descriptor. virtual void nacd_2 (void) {}; // Actually the GC bitmap marking descriptor.
# endif # endif
}; };
}
// Forward declarations for friends of java::lang::Object // Forward declarations for friends of java::lang::Object
void _Jv_MonitorEnter (jobject obj); void _Jv_MonitorEnter (jobject obj);