Uniquify uno_initEnvironment and uno_ext_getMapping in the static linking case

4 files changed, 29 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
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx
index e5be92b4b8dc..b09fcacba4e3 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -348,6 +348,13 @@ int  AffineBridge::v_isValid(rtl::OUString * pReason)
     return result;
 }
 
+#ifdef DISABLE_DYNLOADING
+
+#define uno_initEnvironment affine_uno_uno_initEnvironment
+#define uno_ext_getMapping affine_uno_uno_ext_getMapping
+
+#endif
+
 extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_initEnvironment(uno_Environment * pEnv)
     SAL_THROW_EXTERN_C()
 {
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index 0451f9484579..877d8e52ae0c 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -262,6 +262,13 @@ void LogProbe(
     }
 }
 
+#ifdef DISABLE_DYNLOADING
+
+#define uno_initEnvironment log_uno_uno_initEnvironment
+#define uno_ext_getMapping log_uno_uno_ext_getMapping
+
+#endif
+
 extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_initEnvironment(uno_Environment * pEnv)
     SAL_THROW_EXTERN_C()
 {