summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-01-18 16:39:59 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-01-19 08:19:38 +0100
commit697f01e052ae73e88d7e1a37386f2648d57e12e2 (patch)
tree6dc879a6307ad905b909e0eb88bb143899806279 /include
parent161af2120f41f34fe562f677907ccfba41f7012a (diff)
SAL_W32 is just an alias for _WIN32
...so consistently use the latter instead of the former Change-Id: I144d5e7c472632f93b2258461510346bc85892d9 Reviewed-on: https://gerrit.libreoffice.org/48135 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/osl/module.h2
-rw-r--r--include/osl/process.h4
-rw-r--r--include/osl/signal.h4
-rw-r--r--include/osl/time.h4
-rw-r--r--include/rtl/locale.h4
-rw-r--r--include/rtl/string.h4
-rw-r--r--include/rtl/ustring.h4
-rw-r--r--include/sal/main.h6
-rw-r--r--include/sal/types.h6
-rw-r--r--include/typelib/typedescription.h4
-rw-r--r--include/typelib/uik.h4
-rw-r--r--include/uno/any2.h4
-rw-r--r--include/uno/dispatcher.h4
-rw-r--r--include/uno/environment.h4
-rw-r--r--include/uno/mapping.h4
15 files changed, 31 insertions, 31 deletions
diff --git a/include/osl/module.h b/include/osl/module.h
index 03c9a80d114a..76099a94ca6c 100644
--- a/include/osl/module.h
+++ b/include/osl/module.h
@@ -36,7 +36,7 @@ extern "C" {
#define SAL_MODULENAME(name) name SAL_DLLEXTENSION
#endif
-#if defined(SAL_W32)
+#if defined(_WIN32)
#define SAL_MODULENAME_WITH_VERSION(name, version) name version SAL_DLLEXTENSION
#elif defined(SAL_UNX)
diff --git a/include/osl/process.h b/include/osl/process.h
index 52aa8bd0f311..a2c1eed4193c 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -69,7 +69,7 @@ typedef enum {
osl_Process_E_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
} oslProcessError;
-#ifdef SAL_W32
+#ifdef _WIN32
# pragma pack(push, 8)
#endif
@@ -83,7 +83,7 @@ typedef struct {
sal_uInt32 HeapUsage;
} oslProcessInfo;
-#if defined( SAL_W32)
+#if defined( _WIN32)
# pragma pack(pop)
#endif
diff --git a/include/osl/signal.h b/include/osl/signal.h
index dd05b0a6889d..4b7beadc295a 100644
--- a/include/osl/signal.h
+++ b/include/osl/signal.h
@@ -58,7 +58,7 @@ typedef enum
osl_Signal_Act_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
} oslSignalAction;
-#ifdef SAL_W32
+#ifdef _WIN32
# pragma pack(push, 8)
#endif
@@ -69,7 +69,7 @@ typedef struct
void* UserData;
} oslSignalInfo;
-#if defined( SAL_W32)
+#if defined( _WIN32)
# pragma pack(pop)
#endif
diff --git a/include/osl/time.h b/include/osl/time.h
index 490fc9f3e36e..5dd8d9d8f342 100644
--- a/include/osl/time.h
+++ b/include/osl/time.h
@@ -29,7 +29,7 @@
#include "sal/saldllapi.h"
#include "sal/types.h"
-#ifdef SAL_W32
+#ifdef _WIN32
# pragma pack(push, 8)
#endif
@@ -74,7 +74,7 @@ typedef struct {
#endif
-#if defined(SAL_W32)
+#if defined(_WIN32)
# pragma pack(pop)
#endif
diff --git a/include/rtl/locale.h b/include/rtl/locale.h
index 127a81b87c4c..c8b80b4e9646 100644
--- a/include/rtl/locale.h
+++ b/include/rtl/locale.h
@@ -29,7 +29,7 @@
extern "C" {
#endif
-#ifdef SAL_W32
+#ifdef _WIN32
# pragma pack(push, 8)
#endif
@@ -59,7 +59,7 @@ typedef struct _rtl_Locale
sal_Int32 HashCode;
} rtl_Locale;
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(pop)
#endif
diff --git a/include/rtl/string.h b/include/rtl/string.h
index 1aa11fd06a88..ecf4704b0999 100644
--- a/include/rtl/string.h
+++ b/include/rtl/string.h
@@ -836,7 +836,7 @@ SAL_DLLPUBLIC double SAL_CALL rtl_str_toDouble(
/* ======================================================================= */
-#ifdef SAL_W32
+#ifdef _WIN32
# pragma pack(push, 8)
#endif
@@ -851,7 +851,7 @@ typedef struct _rtl_String
} rtl_String;
/** @endcond */
-#if defined(SAL_W32)
+#if defined(_WIN32)
#pragma pack(pop)
#endif
diff --git a/include/rtl/ustring.h b/include/rtl/ustring.h
index 911cc033a721..e46e646c9c71 100644
--- a/include/rtl/ustring.h
+++ b/include/rtl/ustring.h
@@ -1166,7 +1166,7 @@ SAL_DLLPUBLIC double SAL_CALL rtl_ustr_toDouble(
/* ======================================================================= */
-#if defined(SAL_W32)
+#if defined(_WIN32)
#pragma pack(push, 4)
#endif
@@ -1181,7 +1181,7 @@ typedef struct SAL_DLLPUBLIC_RTTI _rtl_uString
} rtl_uString;
/** @endcond */
-#if defined(SAL_W32)
+#if defined(_WIN32)
#pragma pack(pop)
#endif
diff --git a/include/sal/main.h b/include/sal/main.h
index 4519e8690cb1..9b5ba2b8d69b 100644
--- a/include/sal/main.h
+++ b/include/sal/main.h
@@ -67,7 +67,7 @@ int SAL_DLLPUBLIC_EXPORT SAL_CALL main(int argc, char ** argv) \
/* Definition macros for CRT entries */
-#ifdef SAL_W32
+#ifdef _WIN32
#include <stdlib.h>
@@ -99,11 +99,11 @@ int WINAPI WinMain( HINSTANCE _hinst, HINSTANCE _dummy, char* _cmdline, int _nsh
return main(argc, argv); \
}
-#else /* ! SAL_W32 */
+#else /* ! _WIN32 */
# define SAL_WIN_WinMain
-#endif /* ! SAL_W32 */
+#endif /* ! _WIN32 */
/* Implementation macro */
diff --git a/include/sal/types.h b/include/sal/types.h
index 49f7568a1978..5f6331709af3 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -135,7 +135,7 @@ typedef unsigned char sal_uChar;
#if defined LIBO_INTERNAL_ONLY && defined __cplusplus
#define SAL_UNICODE_NOTEQUAL_WCHAR_T
typedef char16_t sal_Unicode;
-#elif defined(SAL_W32)
+#elif defined(_WIN32)
typedef wchar_t sal_Unicode;
#else
#define SAL_UNICODE_NOTEQUAL_WCHAR_T
@@ -315,7 +315,7 @@ typedef void * sal_Handle;
# define SAL_NO_VTABLE
#endif
-#ifdef SAL_W32
+#ifdef _WIN32
# pragma pack(push, 8)
#endif
@@ -337,7 +337,7 @@ typedef struct _sal_Sequence
#define SAL_SEQUENCE_HEADER_SIZE ((sal_Size) offsetof(sal_Sequence,elements))
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(pop)
#endif
diff --git a/include/typelib/typedescription.h b/include/typelib/typedescription.h
index a6350b409b29..51b13af29d57 100644
--- a/include/typelib/typedescription.h
+++ b/include/typelib/typedescription.h
@@ -31,7 +31,7 @@ extern "C"
struct _typelib_TypeDescription;
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(push, 8)
#endif
@@ -477,7 +477,7 @@ typedef struct _typelib_Parameter_Init
sal_Bool bOut;
} typelib_Parameter_Init;
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(pop)
#endif
diff --git a/include/typelib/uik.h b/include/typelib/uik.h
index 4899e95161b2..4c077ffeba65 100644
--- a/include/typelib/uik.h
+++ b/include/typelib/uik.h
@@ -21,7 +21,7 @@
#include "sal/types.h"
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(push, 8)
#endif
@@ -38,7 +38,7 @@ typedef struct _typelib_Uik
sal_uInt32 m_Data5;
} typelib_Uik;
-#if defined( SAL_W32)
+#if defined( _WIN32)
# pragma pack(pop)
#endif
diff --git a/include/uno/any2.h b/include/uno/any2.h
index 29e10485a93c..4493d4c0af96 100644
--- a/include/uno/any2.h
+++ b/include/uno/any2.h
@@ -27,7 +27,7 @@ extern "C"
{
#endif
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(push, 8)
#endif
@@ -52,7 +52,7 @@ typedef struct SAL_DLLPUBLIC_RTTI _uno_Any
void * pReserved;
} uno_Any;
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(pop)
#endif
diff --git a/include/uno/dispatcher.h b/include/uno/dispatcher.h
index 44b319a04b6f..f9d1fbc31bf1 100644
--- a/include/uno/dispatcher.h
+++ b/include/uno/dispatcher.h
@@ -52,7 +52,7 @@ typedef void (SAL_CALL * uno_DispatchMethod)(
void * pArgs[],
uno_Any ** ppException );
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(push, 8)
#endif
@@ -75,7 +75,7 @@ typedef struct SAL_DLLPUBLIC_RTTI _uno_Interface
uno_DispatchMethod pDispatcher;
} uno_Interface;
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(pop)
#endif
diff --git a/include/uno/environment.h b/include/uno/environment.h
index 8874d1680e03..b68a0c5041c0 100644
--- a/include/uno/environment.h
+++ b/include/uno/environment.h
@@ -32,7 +32,7 @@ extern "C"
struct _uno_ExtEnvironment;
struct _typelib_InterfaceTypeDescription;
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(push, 8)
#endif
@@ -245,7 +245,7 @@ typedef struct SAL_DLLPUBLIC_RTTI _uno_ExtEnvironment
} uno_ExtEnvironment;
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(pop)
#endif
diff --git a/include/uno/mapping.h b/include/uno/mapping.h
index c1fae966ee30..cb24839eba1b 100644
--- a/include/uno/mapping.h
+++ b/include/uno/mapping.h
@@ -55,7 +55,7 @@ typedef void (SAL_CALL * uno_MapInterfaceFunc)(
struct _typelib_InterfaceTypeDescription * pInterfaceTypeDescr );
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(push, 8)
#endif
@@ -76,7 +76,7 @@ typedef struct SAL_DLLPUBLIC_RTTI _uno_Mapping
uno_MapInterfaceFunc mapInterface;
} uno_Mapping;
-#if defined( SAL_W32)
+#if defined( _WIN32)
#pragma pack(pop)
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 11:43:11 +0000