diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-18 16:39:59 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-19 08:19:38 +0100 |
| commit | 697f01e052ae73e88d7e1a37386f2648d57e12e2 (patch) | |
| tree | 6dc879a6307ad905b909e0eb88bb143899806279 /include/sal | |
| parent | 161af2120f41f34fe562f677907ccfba41f7012a (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/sal')
| -rw-r--r-- | include/sal/main.h | 6 | ||||
| -rw-r--r-- | include/sal/types.h | 6 |
2 files changed, 6 insertions, 6 deletions
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 |