diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-03-19 18:28:42 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-03-21 00:00:04 +0200 |
| commit | c0ab229dc74e116760866f27b5df12e76430aef5 (patch) | |
| tree | dbb5ec2e9faa08338d7ca4cc5a87d84bca5f36ea /cppu/inc | |
| parent | c3f36b0e4738f44375359789d450a28e7664d529 (diff) | |
Uniquify uno_initEnvironment and uno_ext_getMapping in the static linking case
Diffstat (limited to 'cppu/inc')
| -rw-r--r-- | cppu/inc/uno/environment.h | 12 | ||||
| -rw-r--r-- | cppu/inc/uno/mapping.h | 9 |
2 files changed, 15 insertions, 6 deletions
diff --git a/cppu/inc/uno/environment.h b/cppu/inc/uno/environment.h index 5c3a7c144ebb..018b035c5ec1 100644 --- a/cppu/inc/uno/environment.h +++ b/cppu/inc/uno/environment.h @@ -266,6 +266,12 @@ typedef struct _uno_ExtEnvironment 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 */ +void SAL_CALL CPPU_ENV_uno_initEnvironment( uno_Environment * Env ) + SAL_THROW_EXTERN_C(); +#endif + /** Gets a specific environment. If the specified environment does not exist, then a default one is created and registered. The environment revokes itself on last release() call. @@ -375,12 +381,6 @@ CPPU_DLLPUBLIC void SAL_CALL uno_Environment_enter(uno_Environment * pEnv) CPPU_DLLPUBLIC int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pReason) SAL_THROW_EXTERN_C(); -#ifdef IOS -/* We link statically on iOS and have just one kind of environment */ -void SAL_CALL gcc3_uno_initEnvironment(uno_Environment *pCppEnv) - SAL_THROW_EXTERN_C(); -#endif - #ifdef __cplusplus } #endif diff --git a/cppu/inc/uno/mapping.h b/cppu/inc/uno/mapping.h index 65fb206f11b4..df1379c05214 100644 --- a/cppu/inc/uno/mapping.h +++ b/cppu/inc/uno/mapping.h @@ -195,6 +195,15 @@ typedef void (SAL_CALL * uno_ext_getMappingFunc)( struct _uno_Environment * pFrom, struct _uno_Environment * pTo ); +#ifdef DISABLE_DYNLOADING +/* Static linking, this is the uno_ext_getMapping function in the C++/UNO bridge */ +void SAL_CALL CPPU_ENV_uno_ext_getMapping( + struct _uno_Mapping ** ppMapping, + struct _uno_Environment * pFrom, + struct _uno_Environment * pTo ) + SAL_THROW_EXTERN_C(); +#endif + #ifdef __cplusplus } #endif |