diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-04-07 15:55:02 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-04-07 15:55:02 +0000 |
| commit | 305104fdc55b3a2237c6fff6f36545556a28d91c (patch) | |
| tree | 5d11af1d0803ae77593c8e8e5b7621b20166dee5 /libjava | |
| parent | 90fb08fc73be441f9af09ad8ca93b6d837bc4dcf (diff) | |
| download | gcc-305104fdc55b3a2237c6fff6f36545556a28d91c.tar.gz | |
* name-lookup.c (current_decl_namespace): Non-static.
(pop_nested_namespace): Sanity check.
* cp-tree.h: Declare current_decl_namespace.
* decl.c (grokvardecl): Use it instead of current_namespace.
(grokfndecl): Likewise.
* gnu/gcj/runtime/natSharedLibLoader.cc (findCore): Move
declaration of _Jv_create_core out of the function.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158074 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/gnu/gcj/runtime/natSharedLibLoader.cc | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8bc03cc54ad..0a46cf50d81 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2010-04-07 Jason Merrill <jason@redhat.com> + + * gnu/gcj/runtime/natSharedLibLoader.cc (findCore): Move + declaration of _Jv_create_core out of the function. + 2010-04-02 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * Makefile.in: Regenerate. diff --git a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc index 0d8d0e8341b..fabdbcbe526 100644 --- a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc +++ b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc @@ -119,11 +119,14 @@ gnu::gcj::runtime::SharedLibHelper::hasResource (jstring name) #endif } +#ifdef HAVE_DLOPEN +extern gnu::gcj::Core *_Jv_create_core (_Jv_core_chain *node, jstring name); +#endif + gnu::gcj::Core * gnu::gcj::runtime::SharedLibHelper::findCore (jstring name) { #ifdef HAVE_DLOPEN - extern gnu::gcj::Core *_Jv_create_core (_Jv_core_chain *node, jstring name); ensureInit(); return _Jv_create_core ((_Jv_core_chain *) core_chain, name); #else |