diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2010-01-31 20:20:27 +0100 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2010-01-31 20:20:27 +0100 |
| commit | da599549cc4ac52d298ba10bd481ea279b587a89 (patch) | |
| tree | 50699100098c60f1de849f2d01376b5befd719b0 /sal | |
| parent | 5ba32a9abf26e7cb37f7ff3280a230dbf2bd5952 (diff) | |
#i50885# fix build problem
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/w32/process.cxx | 6 | ||||
| -rw-r--r-- | sal/osl/w32/system.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx index bbcb5109778f..705b151d9505 100644 --- a/sal/osl/w32/process.cxx +++ b/sal/osl/w32/process.cxx @@ -221,7 +221,7 @@ oslProcessError SAL_CALL osl_joinProcessWithTimeout(oslProcess Process, const Ti * ***************************************************************************/ -oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl ( +extern "C" oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl ( rtl_uString ** ppFileURL ) SAL_THROW_EXTERN_C() { @@ -416,7 +416,7 @@ oslProcessError SAL_CALL osl_getEnvironment(rtl_uString *ustrVar, rtl_uString ** * Current Working Directory. ***************************************************************************/ -extern oslMutex g_CurrentDirectoryMutex; +extern "C" oslMutex g_CurrentDirectoryMutex; oslProcessError SAL_CALL osl_getProcessWorkingDir( rtl_uString **pustrWorkingDir ) { @@ -451,7 +451,7 @@ oslProcessError SAL_CALL osl_getProcessWorkingDir( rtl_uString **pustrWorkingDir * Process Locale. ***************************************************************************/ -extern void _imp_getProcessLocale( rtl_Locale ** ppLocale ); +extern "C" void _imp_getProcessLocale( rtl_Locale ** ppLocale ); static rtl_Locale * g_theProcessLocale = NULL; diff --git a/sal/osl/w32/system.h b/sal/osl/w32/system.h index 6e1cebc3aa93..33cc44c561a4 100644 --- a/sal/osl/w32/system.h +++ b/sal/osl/w32/system.h @@ -108,7 +108,11 @@ #endif // #ifdef GCC #ifdef _DLL_ +#ifdef __cplusplus + extern "C" DWORD g_dwPlatformId; +#else extern DWORD g_dwPlatformId; +#endif // #ifdef __cplusplus #define IS_NT (g_dwPlatformId == VER_PLATFORM_WIN32_NT) #else extern DWORD GetPlatformId(void); |