diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-09-20 12:42:48 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-09-20 12:52:15 +0300 |
| commit | 69765868e30494eb39a2b4b7566f161ef1f3db04 (patch) | |
| tree | 2aa7e54700965729ae5c890f9d8d724e282c1799 /cppu | |
| parent | 1f77f1ac177521698ee7c978f218127cb5840046 (diff) | |
DISABLE_DYNLOADING magic also for the jni_uno environment
Change-Id: I5e966a5734308381ad305b891ecfc830dc1419f6
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/inc/uno/environment.h | 7 | ||||
| -rw-r--r-- | cppu/source/uno/lbenv.cxx | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/cppu/inc/uno/environment.h b/cppu/inc/uno/environment.h index bbba4c980c0b..e76ed2fc7ba6 100644 --- a/cppu/inc/uno/environment.h +++ b/cppu/inc/uno/environment.h @@ -258,9 +258,14 @@ typedef void (SAL_CALL * uno_initEnvironmentFunc)( uno_Environment * pEnv ); #define UNO_INIT_ENVIRONMENT "uno_initEnvironment" #ifdef DISABLE_DYNLOADING -/* We link statically and have just one kind of environment */ +/* We link statically and have just the C++ environment */ void SAL_CALL CPPU_ENV_uno_initEnvironment( uno_Environment * Env ) SAL_THROW_EXTERN_C(); +#ifdef SOLAR_JAVA +/* We also have the Java environment */ +void SAL_CALL java_uno_initEnvironment( uno_Environment * Env ) + SAL_THROW_EXTERN_C(); +#endif #endif /** Gets a specific environment. If the specified environment does not exist, then a default one diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index ff6de9a9a815..439d49bf8748 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -1058,6 +1058,10 @@ static bool loadEnv(OUString const & cLibStem, if ( cLibStem == CPPU_CURRENT_LANGUAGE_BINDING_NAME "_uno" ) fpInit = CPPU_ENV_uno_initEnvironment; +#ifdef SOLAR_JAVA + else if ( cLibStem == "java_uno" ) + fpInit = java_uno_initEnvironment; +#endif else { #if OSL_DEBUG_LEVEL > 1 |