diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-17 09:31:26 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-17 09:31:46 +0200 |
| commit | 24aec4dad64f8408552ba1c1e070b04a7297713f (patch) | |
| tree | 0114daf8d1e756188aef53d9475749ebd881bf3b /sal | |
| parent | b8834500f714005ba335a9219a43492a321b5df2 (diff) | |
Include header with prototypes of defined functions
Change-Id: Ia28c36b1627ef944adecd5c8a55c150bd0f9aa02
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/salinit.cxx | 5 | ||||
| -rw-r--r-- | sal/osl/w32/salinit.cxx | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx index 22da0a511186..ab6a7ee19af2 100644 --- a/sal/osl/unx/salinit.cxx +++ b/sal/osl/unx/salinit.cxx @@ -35,11 +35,12 @@ #endif #include "osl/process.h" +#include "sal/main.h" #include "sal/types.h" extern "C" { -SAL_DLLPUBLIC_EXPORT void SAL_CALL sal_detail_initialize(int argc, char ** argv) { +void 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 +70,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL sal_detail_initialize(int argc, char ** argv) osl_setCommandArgs(argc, argv); } -SAL_DLLPUBLIC_EXPORT void SAL_CALL sal_detail_deinitialize() {} +void sal_detail_deinitialize() {} } diff --git a/sal/osl/w32/salinit.cxx b/sal/osl/w32/salinit.cxx index 520be587a026..49394ce659e6 100644 --- a/sal/osl/w32/salinit.cxx +++ b/sal/osl/w32/salinit.cxx @@ -33,6 +33,7 @@ #include "system.h" #include <osl/process.h> +#include <sal/main.h> #include <sal/types.h> #ifdef __cplusplus @@ -58,7 +59,7 @@ extern "C" void invalidParameterHandler( // Prototypes for initialization and deinitialization of SAL library -SAL_DLLPUBLIC_EXPORT void SAL_CALL sal_detail_initialize(int argc, char ** argv) +void sal_detail_initialize(int argc, char ** argv) { // SetProcessDEPPolicy(PROCESS_DEP_ENABLE); // SetDllDirectoryW(L""); @@ -118,7 +119,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL sal_detail_initialize(int argc, char ** argv) osl_setCommandArgs(argc, argv); } -SAL_DLLPUBLIC_EXPORT void SAL_CALL sal_detail_deinitialize() +void sal_detail_deinitialize() { if ( SOCKET_ERROR == WSACleanup() ) { |