diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2009-01-27 10:09:23 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2009-01-27 10:09:23 +0000 |
| commit | 1716a42d97cdfe8138de9520cc3d4326414ffd18 (patch) | |
| tree | 5942a0eadf605feed352a00fbf94308b82bb8e05 | |
| parent | 4c54287fac3cf7a9806dfbaa5dfa28c07480243f (diff) | |
PR libgcj/38872
* gcj/javaprims.h (_Jv_CreateJavaVM): Change to extern "C" symbol.
* libjgc_bc.c (_Jv_GetStringChars): Remove.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@143698 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/gcj/javaprims.h | 6 | ||||
| -rw-r--r-- | libjava/libgcj_bc.c | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ebef09f23ef..d28dcc86ec8 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2009-01-26 Jakub Jelinek <jakub@redhat.com> + + PR libgcj/38872 + * gcj/javaprims.h (_Jv_CreateJavaVM): Change to extern "C" symbol. + * libjgc_bc.c (_Jv_GetStringChars): Remove. + 2009-01-12 Andrew Haley <aph@redhat.com> * sun/misc/natUnsafe.cc (spinlock contructor): Call sched_yield(). diff --git a/libjava/gcj/javaprims.h b/libjava/gcj/javaprims.h index 313ecc02efc..3a0c964a437 100644 --- a/libjava/gcj/javaprims.h +++ b/libjava/gcj/javaprims.h @@ -1,8 +1,8 @@ // javaprims.h - Main external header file for libgcj. -*- c++ -*- -/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 - Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, + 2008, 2009 Free Software Foundation This file is part of libgcj. @@ -919,7 +919,7 @@ struct _Jv_VMInitArgs jboolean ignoreUnrecognized; }; -extern jint _Jv_CreateJavaVM (struct _Jv_VMInitArgs*); +extern "C" jint _Jv_CreateJavaVM (struct _Jv_VMInitArgs*); void _Jv_ThreadRun (java::lang::Thread* thread); diff --git a/libjava/libgcj_bc.c b/libjava/libgcj_bc.c index 7073d7308b2..e8da443f5fb 100644 --- a/libjava/libgcj_bc.c +++ b/libjava/libgcj_bc.c @@ -1,6 +1,6 @@ /* libgcj_bc.c */ -/* Copyright (C) 2006 Free Software Foundation +/* Copyright (C) 2006, 2009 Free Software Foundation This file is part of libgcj. @@ -89,7 +89,6 @@ void _Jv_AttachCurrentThreadAsDaemon () {} void _Jv_CreateJavaVM () {} void _Jv_DetachCurrentThread () {} void _Jv_Free () {} -void _Jv_GetStringChars () {} void _Jv_GetStringUTFLength () {} void _Jv_GetStringUTFRegion () {} void _Jv_Malloc () {} |