From ae099258d3654e328fca96e0ebd457487a70a685 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 7 Apr 2010 11:55:02 -0400 Subject: name-lookup.c (current_decl_namespace): Non-static. * 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. From-SVN: r158074 --- libjava/ChangeLog | 5 +++++ libjava/gnu/gcj/runtime/natSharedLibLoader.cc | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'libjava') diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8bc03cc..0a46cf5 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2010-04-07 Jason Merrill + + * gnu/gcj/runtime/natSharedLibLoader.cc (findCore): Move + declaration of _Jv_create_core out of the function. + 2010-04-02 Ralf Wildenhues * Makefile.in: Regenerate. diff --git a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc index 0d8d0e8..fabdbcb 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 -- cgit v1.1