diff options
47 files changed, 189 insertions, 79 deletions
diff --git a/sal/inc/osl/conditn.h b/sal/inc/osl/conditn.h index 94088a87c7b2..982d8cc8f935 100644 --- a/sal/inc/osl/conditn.h +++ b/sal/inc/osl/conditn.h @@ -30,7 +30,10 @@ #ifndef _OSL_CONDITION_H_ #define _OSL_CONDITION_H_ -#include <osl/time.h> +#include "sal/config.h" + +#include "osl/time.h" +#include "sal/saldllapi.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/osl/detail/file.h b/sal/inc/osl/detail/file.h index f9798da4768e..7968e29141a1 100644 --- a/sal/inc/osl/detail/file.h +++ b/sal/inc/osl/detail/file.h @@ -30,7 +30,11 @@ #ifndef INCLUDED_OSL_DETAIL_FILE_H #define INCLUDED_OSL_DETAIL_FILE_H +#include "sal/config.h" + #include <sys/stat.h> + +#include "sal/saldllapi.h" #include "sal/types.h" /** @cond INTERNAL */ diff --git a/sal/inc/osl/diagnose.h b/sal/inc/osl/diagnose.h index f094abe5d534..191bba00e7d5 100644 --- a/sal/inc/osl/diagnose.h +++ b/sal/inc/osl/diagnose.h @@ -32,8 +32,9 @@ #include "sal/config.h" -#include <sal/detail/log.h> -#include <sal/types.h> +#include "sal/detail/log.h" +#include "sal/saldllapi.h" +#include "sal/types.h" /** provides simple diagnostic support diff --git a/sal/inc/osl/diagnose.hxx b/sal/inc/osl/diagnose.hxx index 6463d8dcca5d..55e5bf00af6b 100644 --- a/sal/inc/osl/diagnose.hxx +++ b/sal/inc/osl/diagnose.hxx @@ -40,6 +40,7 @@ #include "rtl/allocator.hxx" #include "rtl/instance.hxx" #include "sal/log.hxx" +#include "sal/saldllapi.h" #include "sal/types.h" /// @cond INTERNAL diff --git a/sal/inc/osl/file.h b/sal/inc/osl/file.h index 2c2713b6da5c..5e47f622c2e6 100644 --- a/sal/inc/osl/file.h +++ b/sal/inc/osl/file.h @@ -29,8 +29,11 @@ #ifndef _OSL_FILE_H_ #define _OSL_FILE_H_ -#include <osl/time.h> -# include <rtl/ustring.h> +#include "sal/config.h" + +#include "osl/time.h" +#include "rtl/ustring.h" +#include "sal/saldllapi.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/osl/interlck.h b/sal/inc/osl/interlck.h index b56e8bd3a361..858f99f854d5 100644 --- a/sal/inc/osl/interlck.h +++ b/sal/inc/osl/interlck.h @@ -29,7 +29,10 @@ #ifndef _OSL_INTERLOCK_H_ #define _OSL_INTERLOCK_H_ -#include <sal/types.h> +#include "sal/config.h" + +#include "sal/saldllapi.h" +#include "sal/types.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/osl/module.h b/sal/inc/osl/module.h index a1a4a678b58f..f58909909aa2 100644 --- a/sal/inc/osl/module.h +++ b/sal/inc/osl/module.h @@ -29,8 +29,11 @@ #ifndef _OSL_MODULE_H_ #define _OSL_MODULE_H_ -# include <rtl/ustring.h> -# include <rtl/tencinfo.h> +#include "sal/config.h" + +#include "rtl/tencinfo.h" +#include "rtl/ustring.h" +#include "sal/saldllapi.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/osl/mutex.h b/sal/inc/osl/mutex.h index 6efa8218768f..bc9bd7cf076a 100644 --- a/sal/inc/osl/mutex.h +++ b/sal/inc/osl/mutex.h @@ -29,7 +29,10 @@ #ifndef _OSL_MUTEX_H_ #define _OSL_MUTEX_H_ -#include <sal/types.h> +#include "sal/config.h" + +#include "sal/saldllapi.h" +#include "sal/types.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/osl/nlsupport.h b/sal/inc/osl/nlsupport.h index 3b66c8ec7ed7..94e308947661 100644 --- a/sal/inc/osl/nlsupport.h +++ b/sal/inc/osl/nlsupport.h @@ -30,8 +30,11 @@ #ifndef _OSL_NLSUPPORT_H_ #define _OSL_NLSUPPORT_H_ -# include <rtl/locale.h> -# include <rtl/textenc.h> +#include "sal/config.h" + +#include "rtl/locale.h" +#include "rtl/textenc.h" +#include "sal/saldllapi.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/osl/pipe.h b/sal/inc/osl/pipe.h index 1245d856156a..599121855560 100644 --- a/sal/inc/osl/pipe.h +++ b/sal/inc/osl/pipe.h @@ -30,10 +30,11 @@ #ifndef _OSL_PIPE_H_ #define _OSL_PIPE_H_ -# include <rtl/ustring.h> +#include "sal/config.h" - -# include <osl/security.h> +#include "osl/security.h" +#include "rtl/ustring.h" +#include "sal/saldllapi.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/osl/process.h b/sal/inc/osl/process.h index bd8c2c4ea367..cdd9fc433f47 100644 --- a/sal/inc/osl/process.h +++ b/sal/inc/osl/process.h @@ -30,15 +30,17 @@ #ifndef _OSL_PROCESS_H_ #define _OSL_PROCESS_H_ -#include <rtl/ustring.h> -#include <rtl/textenc.h> -#include <rtl/locale.h> - -#include <osl/time.h> -#include <osl/file.h> -#include <osl/pipe.h> -#include <osl/socket.h> -#include <osl/security.h> +#include "sal/config.h" + +#include "osl/file.h" +#include "osl/pipe.h" +#include "osl/security.h" +#include "osl/socket.h" +#include "osl/time.h" +#include "rtl/locale.h" +#include "rtl/textenc.h" +#include "rtl/ustring.h" +#include "sal/saldllapi.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/osl/profile.h b/sal/inc/osl/profile.h index bc4b8ffe4ead..23e18a1a75c8 100644 --- a/sal/inc/osl/profile.h +++ b/sal/inc/osl/profile.h @@ -29,8 +29,11 @@ #ifndef _OSL_PROFILE_H_ #define _OSL_PROFILE_H_ -#include <sal/types.h> -#include <rtl/ustring.h> +#include "sal/config.h" + +#include "rtl/ustring.h" +#include "sal/saldllapi.h" +#include "sal/types.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/osl/security.h b/sal/inc/osl/security.h index 85e8abd1b34b..7140b768f92a 100644 --- a/sal/inc/osl/security.h +++ b/sal/inc/osl/security.h @@ -29,7 +29,10 @@ #ifndef _OSL_SECURITY_H_ #define _OSL_SECURITY_H_ -#include <rtl/ustring.h> +#include "sal/config.h" + +#include "rtl/ustring.h" +#include "sal/saldllapi.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/osl/semaphor.h b/sal/inc/osl/semaphor.h index fb0cc7130240..3ba350a5820d 100644 --- a/sal/inc/osl/semaphor.h +++ b/sal/inc/osl/semaphor.h @@ -29,7 +29,10 @@ #ifndef _OSL_SEMAPHORE_H_ #define _OSL_SEMAPHORE_H_ -#include <sal/types.h> +#include "sal/config.h" + +#include "sal/saldllapi.h" +#include "sal/types.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/osl/signal.h b/sal/inc/osl/signal.h index 782eb5fd9ec9..9d609b6f9006 100644 --- a/sal/inc/osl/signal.h +++ b/sal/inc/osl/signal.h @@ -29,6 +29,9 @@ #ifndef _OSL_SIGNAL_H_ #define _OSL_SIGNAL_H_ +#include "sal/config.h" + +#include "sal/saldllapi.h" #include "sal/types.h" #ifdef __cplusplus diff --git a/sal/inc/osl/thread.h b/sal/inc/osl/thread.h index cf44a281c0bb..db0e1872295d 100644 --- a/sal/inc/osl/thread.h +++ b/sal/inc/osl/thread.h @@ -29,11 +29,11 @@ #ifndef _OSL_THREAD_H_ #define _OSL_THREAD_H_ -#include <osl/time.h> +#include "sal/config.h" -#ifndef _RTL_TEXTENC_H_ -# include <rtl/textenc.h> -#endif +#include "osl/time.h" +#include "rtl/textenc.h" +#include "sal/saldllapi.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/osl/time.h b/sal/inc/osl/time.h index ddeb7a1bdda8..2456065da0cb 100644 --- a/sal/inc/osl/time.h +++ b/sal/inc/osl/time.h @@ -29,7 +29,10 @@ #ifndef _OSL_TIME_H_ #define _OSL_TIME_H_ -#include <sal/types.h> +#include "sal/config.h" + +#include "sal/saldllapi.h" +#include "sal/types.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/osl/util.h b/sal/inc/osl/util.h index 330279d513c6..1e6aa5941864 100644 --- a/sal/inc/osl/util.h +++ b/sal/inc/osl/util.h @@ -30,6 +30,9 @@ #ifndef _OSL_UTIL_H_ #define _OSL_UTIL_H_ +#include "sal/config.h" + +#include "sal/saldllapi.h" #include "sal/types.h" #ifdef __cplusplus diff --git a/sal/inc/rtl/alloc.h b/sal/inc/rtl/alloc.h index 35c7e5b308b4..9c2d7efb7f42 100644 --- a/sal/inc/rtl/alloc.h +++ b/sal/inc/rtl/alloc.h @@ -29,7 +29,10 @@ #ifndef _RTL_ALLOC_H_ #define _RTL_ALLOC_H_ -# include <sal/types.h> +#include "sal/config.h" + +#include "sal/saldllapi.h" +#include "sal/types.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/rtl/bootstrap.h b/sal/inc/rtl/bootstrap.h index 90705699be94..6e3fc4aee708 100644 --- a/sal/inc/rtl/bootstrap.h +++ b/sal/inc/rtl/bootstrap.h @@ -28,7 +28,10 @@ #ifndef _RTL_BOOTSTRAP_H_ #define _RTL_BOOTSTRAP_H_ -#include <rtl/ustring.h> +#include "sal/config.h" + +#include "rtl/ustring.h" +#include "sal/saldllapi.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/rtl/byteseq.h b/sal/inc/rtl/byteseq.h index 8d52c7e49adc..e863dffa7abd 100644 --- a/sal/inc/rtl/byteseq.h +++ b/sal/inc/rtl/byteseq.h @@ -28,8 +28,12 @@ #ifndef _RTL_BYTESEQ_H_ #define _RTL_BYTESEQ_H_ -#include <sal/types.h> -#include <rtl/alloc.h> +#include "sal/config.h" + +#include "rtl/alloc.h" +#include "rtl/ustring.h" +#include "sal/saldllapi.h" +#include "sal/types.h" #ifdef __cplusplus extern "C" diff --git a/sal/inc/rtl/cipher.h b/sal/inc/rtl/cipher.h index 8a67d56cbbec..c7d2dec175fb 100644 --- a/sal/inc/rtl/cipher.h +++ b/sal/inc/rtl/cipher.h @@ -29,7 +29,10 @@ #ifndef _RTL_CIPHER_H_ #define _RTL_CIPHER_H_ -#include <sal/types.h> +#include "sal/config.h" + +#include "sal/saldllapi.h" +#include "sal/types.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/rtl/crc.h b/sal/inc/rtl/crc.h index be3b03b93683..2c975e6ba220 100644 --- a/sal/inc/rtl/crc.h +++ b/sal/inc/rtl/crc.h @@ -29,7 +29,10 @@ #ifndef _RTL_CRC_H_ #define _RTL_CRC_H_ -#include <sal/types.h> +#include "sal/config.h" + +#include "sal/saldllapi.h" +#include "sal/types.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/rtl/digest.h b/sal/inc/rtl/digest.h index c8640dfdfc7f..990a4a8a22d4 100644 --- a/sal/inc/rtl/digest.h +++ b/sal/inc/rtl/digest.h @@ -29,7 +29,10 @@ #ifndef _RTL_DIGEST_H_ #define _RTL_DIGEST_H_ -#include <sal/types.h> +#include "sal/config.h" + +#include "sal/saldllapi.h" +#include "sal/types.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/rtl/locale.h b/sal/inc/rtl/locale.h index 3e67fafeb9c8..e3b6bb4f1241 100644 --- a/sal/inc/rtl/locale.h +++ b/sal/inc/rtl/locale.h @@ -29,7 +29,10 @@ #ifndef _RTL_LOCALE_H_ #define _RTL_LOCALE_H_ -#include <rtl/ustring.h> +#include "sal/config.h" + +#include "rtl/ustring.h" +#include "sal/saldllapi.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/rtl/logfile.h b/sal/inc/rtl/logfile.h index 54027ac83f7f..4ffc0a1a3e5a 100644 --- a/sal/inc/rtl/logfile.h +++ b/sal/inc/rtl/logfile.h @@ -28,7 +28,10 @@ #ifndef _RTL_LOGFILE_H_ #define _RTL_LOGFILE_H_ -#include <sal/types.h> +#include "sal/config.h" + +#include "sal/saldllapi.h" +#include "sal/types.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/rtl/math.h b/sal/inc/rtl/math.h index 35a0442d7f46..d1817720a55e 100644 --- a/sal/inc/rtl/math.h +++ b/sal/inc/rtl/math.h @@ -29,7 +29,10 @@ #ifndef INCLUDED_RTL_MATH_H #define INCLUDED_RTL_MATH_H +#include "sal/config.h" + #include "rtl/ustring.h" +#include "sal/saldllapi.h" #include "sal/types.h" #if defined __cplusplus diff --git a/sal/inc/rtl/memory.h b/sal/inc/rtl/memory.h index 516040f1880d..0104b78c5792 100644 --- a/sal/inc/rtl/memory.h +++ b/sal/inc/rtl/memory.h @@ -30,7 +30,10 @@ #ifndef _RTL_MEMORY_H_ #define _RTL_MEMORY_H_ -# include <sal/types.h> +#include "sal/config.h" + +#include "sal/saldllapi.h" +#include "sal/types.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/rtl/process.h b/sal/inc/rtl/process.h index ae18e66b969a..c1e055924ac2 100644 --- a/sal/inc/rtl/process.h +++ b/sal/inc/rtl/process.h @@ -28,8 +28,11 @@ #ifndef _RTL_PROCESS_H_ #define _RTL_PROCESS_H_ -#include <sal/types.h> -#include <osl/process.h> +#include "sal/config.h" + +#include "osl/process.h" +#include "sal/saldllapi.h" +#include "sal/types.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/rtl/random.h b/sal/inc/rtl/random.h index 1a54a4a3d033..4e371b695881 100644 --- a/sal/inc/rtl/random.h +++ b/sal/inc/rtl/random.h @@ -29,7 +29,10 @@ #ifndef _RTL_RANDOM_H_ #define _RTL_RANDOM_H_ -#include <sal/types.h> +#include "sal/config.h" + +#include "sal/saldllapi.h" +#include "sal/types.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/rtl/strbuf.h b/sal/inc/rtl/strbuf.h index 64300ecde531..1323b76fc0ee 100644 --- a/sal/inc/rtl/strbuf.h +++ b/sal/inc/rtl/strbuf.h @@ -29,7 +29,10 @@ #ifndef _RTL_STRBUF_H_ #define _RTL_STRBUF_H_ -#include <rtl/string.h> +#include "sal/config.h" + +#include "rtl/string.h" +#include "sal/saldllapi.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/rtl/string.h b/sal/inc/rtl/string.h index f326abe3d7f9..c38e106e6fdb 100644 --- a/sal/inc/rtl/string.h +++ b/sal/inc/rtl/string.h @@ -29,9 +29,12 @@ #ifndef _RTL_STRING_H_ #define _RTL_STRING_H_ -#include <sal/types.h> -#include <osl/interlck.h> -#include <rtl/textcvt.h> +#include "sal/config.h" + +#include "osl/interlck.h" +#include "rtl/textcvt.h" +#include "sal/saldllapi.h" +#include "sal/types.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/rtl/tencinfo.h b/sal/inc/rtl/tencinfo.h index 086b5abea5dc..50e55b389007 100644 --- a/sal/inc/rtl/tencinfo.h +++ b/sal/inc/rtl/tencinfo.h @@ -29,10 +29,11 @@ #ifndef _RTL_TENCINFO_H #define _RTL_TENCINFO_H -#ifndef _SAL_TYPES_H -#include <sal/types.h> -#endif -#include <rtl/textenc.h> +#include "sal/config.h" + +#include "rtl/textenc.h" +#include "sal/saldllapi.h" +#include "sal/types.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/rtl/textcvt.h b/sal/inc/rtl/textcvt.h index 9ca08db12eea..dc8e5c7c72f4 100644 --- a/sal/inc/rtl/textcvt.h +++ b/sal/inc/rtl/textcvt.h @@ -29,10 +29,11 @@ #ifndef _RTL_TEXTCVT_H #define _RTL_TEXTCVT_H -#ifndef _SAL_TYPES_H -#include <sal/types.h> -#endif -#include <rtl/textenc.h> +#include "sal/config.h" + +#include "rtl/textenc.h" +#include "sal/saldllapi.h" +#include "sal/types.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/rtl/unload.h b/sal/inc/rtl/unload.h index 6a196b8fbce1..cdd5536e6bc9 100644 --- a/sal/inc/rtl/unload.h +++ b/sal/inc/rtl/unload.h @@ -28,10 +28,13 @@ #ifndef _RTL_UNLOAD_H_ #define _RTL_UNLOAD_H_ -#include <sal/types.h> -#include <osl/time.h> -#include <osl/interlck.h> -#include <osl/module.h> +#include "sal/config.h" + +#include "osl/interlck.h" +#include "osl/module.h" +#include "osl/time.h" +#include "sal/saldllapi.h" +#include "sal/types.h" /** @file The API enables an effective way of unloading libraries in a centralized way. diff --git a/sal/inc/rtl/uri.h b/sal/inc/rtl/uri.h index 3651db002bfa..3464d24e00ec 100644 --- a/sal/inc/rtl/uri.h +++ b/sal/inc/rtl/uri.h @@ -29,8 +29,11 @@ #ifndef _RTL_URI_H_ #define _RTL_URI_H_ +#include "sal/config.h" + #include "rtl/textenc.h" #include "rtl/ustring.h" +#include "sal/saldllapi.h" #include "sal/types.h" #if defined __cplusplus diff --git a/sal/inc/rtl/ustrbuf.h b/sal/inc/rtl/ustrbuf.h index 1051d0db7fdc..95205664e116 100644 --- a/sal/inc/rtl/ustrbuf.h +++ b/sal/inc/rtl/ustrbuf.h @@ -29,7 +29,10 @@ #ifndef _RTL_USTRBUF_H_ #define _RTL_USTRBUF_H_ -#include <rtl/ustring.h> +#include "sal/config.h" + +#include "rtl/ustring.h" +#include "sal/saldllapi.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/rtl/ustring.h b/sal/inc/rtl/ustring.h index 0e95c51a21d8..5b4982ec1461 100644 --- a/sal/inc/rtl/ustring.h +++ b/sal/inc/rtl/ustring.h @@ -29,10 +29,13 @@ #ifndef _RTL_USTRING_H_ #define _RTL_USTRING_H_ -#include <sal/types.h> -#include <osl/interlck.h> -#include <rtl/string.h> -#include <rtl/textenc.h> +#include "sal/config.h" + +#include "osl/interlck.h" +#include "rtl/string.h" +#include "rtl/textenc.h" +#include "sal/saldllapi.h" +#include "sal/types.h" #ifdef __cplusplus extern "C" { diff --git a/sal/inc/rtl/uuid.h b/sal/inc/rtl/uuid.h index 9d831e0f9146..477a6b3d47dc 100644 --- a/sal/inc/rtl/uuid.h +++ b/sal/inc/rtl/uuid.h @@ -28,9 +28,11 @@ #ifndef _RTL_UUID_H_ #define _RTL_UUID_H_ +#include "sal/config.h" -#include <sal/types.h> -#include <rtl/string.h> +#include "rtl/string.h" +#include "sal/saldllapi.h" +#include "sal/types.h" /** @file diff --git a/sal/inc/sal/detail/log.h b/sal/inc/sal/detail/log.h index 3787adaa74d3..849c0b78f73c 100644 --- a/sal/inc/sal/detail/log.h +++ b/sal/inc/sal/detail/log.h @@ -32,6 +32,7 @@ #include "sal/config.h" +#include "sal/saldllapi.h" #include "sal/types.h" /** @cond INTERNAL */ diff --git a/sal/inc/sal/log.hxx b/sal/inc/sal/log.hxx index 033edb9be17e..2da147971d4c 100644 --- a/sal/inc/sal/log.hxx +++ b/sal/inc/sal/log.hxx @@ -37,6 +37,7 @@ #include <string> #include "sal/detail/log.h" +#include "sal/saldllapi.h" #include "sal/types.h" // Avoid the use of other sal code in this header as much as possible, so that diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h index 3de872e78e67..4d661a52dcc6 100644 --- a/sal/inc/sal/main.h +++ b/sal/inc/sal/main.h @@ -29,9 +29,13 @@ #ifndef _SAL_MAIN_H_ #define _SAL_MAIN_H_ -#include <sal/types.h> -#if defined(AIX) -# include <unistd.h> +#include "sal/config.h" + +#include "sal/saldllapi.h" +#include "sal/types.h" + +#if defined AIX +#include <unistd.h> #endif #ifdef __cplusplus diff --git a/sal/inc/sal/saldllapi.h b/sal/inc/sal/saldllapi.h index a3de15feb899..09e35821c0a1 100644 --- a/sal/inc/sal/saldllapi.h +++ b/sal/inc/sal/saldllapi.h @@ -2,6 +2,8 @@ #ifndef INCLUDED_SALDLLAPI_H #define INCLUDED_SALDLLAPI_H +#include "sal/config.h" + #include "sal/types.h" #if defined(SAL_DLLIMPLEMENTATION) diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index 3db8cf48aff3..f97ecc701438 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -300,8 +300,6 @@ typedef void * sal_Handle; #define SAL_EXCEPTION_DLLPRIVATE #endif -#include <sal/saldllapi.h> - /** Use this as markup for functions and methods whose return value must be checked. diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx index 934d88aa0a3e..8d4d5f2ac3c5 100644 --- a/sal/osl/all/log.cxx +++ b/sal/osl/all/log.cxx @@ -179,7 +179,7 @@ void log( } -SAL_DLLPUBLIC void sal_detail_log( +void sal_detail_log( sal_detail_LogLevel level, char const * area, char const * where, char const * message) { @@ -188,7 +188,7 @@ SAL_DLLPUBLIC void sal_detail_log( } } -SAL_DLLPUBLIC void sal_detail_logFormat( +void sal_detail_logFormat( sal_detail_LogLevel level, char const * area, char const * where, char const * format, ...) { diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx index 2396388aafff..0ce8d86717a7 100644 --- a/sal/osl/unx/salinit.cxx +++ b/sal/osl/unx/salinit.cxx @@ -39,7 +39,7 @@ extern "C" { -SAL_DLLPUBLIC 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 +69,7 @@ SAL_DLLPUBLIC void SAL_CALL sal_detail_initialize(int argc, char ** argv) { osl_setCommandArgs(argc, argv); } -SAL_DLLPUBLIC 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 aaa5a5b321c3..7a498c35c367 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 -SAL_DLLPUBLIC 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 +118,7 @@ SAL_DLLPUBLIC void SAL_CALL sal_detail_initialize(int argc, char ** argv) osl_setCommandArgs(argc, argv); } -SAL_DLLPUBLIC void SAL_CALL sal_detail_deinitialize() +void sal_detail_deinitialize() { if ( SOCKET_ERROR == WSACleanup() ) { |