From eb5b28c3448af4764592baf432cbeba9d91c3c4a Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 16 Sep 2012 08:55:05 +0200 Subject: export sal init and deinit functions Linking of cppunittester (and any other executable that uses SAL_IMPLEMENT_MAIN or SAL_IMPLEMENT_MAIN_WITH_ARGS) fails otherwise. Change-Id: I778941ab2069819789f96ab04f364ea61cf4a3cb --- sal/osl/unx/salinit.cxx | 4 ++-- sal/osl/w32/salinit.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx index 0ce8d86717a7..22da0a511186 100644 --- a/sal/osl/unx/salinit.cxx +++ b/sal/osl/unx/salinit.cxx @@ -39,7 +39,7 @@ extern "C" { -void sal_detail_initialize(int argc, char ** argv) { +SAL_DLLPUBLIC_EXPORT void SAL_CALL sal_detail_initialize(int argc, char ** argv) { #if defined MACOSX // On Mac OS X, soffice can restart itself via exec (see restartOnMac in // desktop/source/app/app.cxx), which leaves all file descriptors open, @@ -69,7 +69,7 @@ void sal_detail_initialize(int argc, char ** argv) { osl_setCommandArgs(argc, argv); } -void sal_detail_deinitialize() {} +SAL_DLLPUBLIC_EXPORT void SAL_CALL sal_detail_deinitialize() {} } diff --git a/sal/osl/w32/salinit.cxx b/sal/osl/w32/salinit.cxx index 7a498c35c367..520be587a026 100644 --- a/sal/osl/w32/salinit.cxx +++ b/sal/osl/w32/salinit.cxx @@ -58,7 +58,7 @@ extern "C" void invalidParameterHandler( // Prototypes for initialization and deinitialization of SAL library -void sal_detail_initialize(int argc, char ** argv) +SAL_DLLPUBLIC_EXPORT void SAL_CALL sal_detail_initialize(int argc, char ** argv) { // SetProcessDEPPolicy(PROCESS_DEP_ENABLE); // SetDllDirectoryW(L""); @@ -118,7 +118,7 @@ void sal_detail_initialize(int argc, char ** argv) osl_setCommandArgs(argc, argv); } -void sal_detail_deinitialize() +SAL_DLLPUBLIC_EXPORT void SAL_CALL sal_detail_deinitialize() { if ( SOCKET_ERROR == WSACleanup() ) { -- cgit v1.2.3