diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-02-22 18:29:43 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-02-22 18:29:43 +0000 |
| commit | af43b1adebde485322ecc3813a01b9e003412223 (patch) | |
| tree | 4298c264415b1dc6f807801334d5a572df1f6e90 /libjava | |
| parent | 84b6a4d217b2762af5b223afc35c56d4c91e9d00 (diff) | |
| download | gcc-af43b1adebde485322ecc3813a01b9e003412223.zip gcc-af43b1adebde485322ecc3813a01b9e003412223.tar.gz gcc-af43b1adebde485322ecc3813a01b9e003412223.tar.bz2 | |
* java/lang/Object.h (_JvObjectPrefix): Declare as extern "Java".
From-SVN: r95405
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/java/lang/Object.h | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 324a5b2..cb31732 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,9 @@ 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: * verify.cc (type::EITHER): New constant. (check_field_constant): Use it. diff --git a/libjava/java/lang/Object.h b/libjava/java/lang/Object.h index 0842e0b..bf68a72 100644 --- 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); |