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/uno | |
| 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/uno')
| -rw-r--r-- | include/uno/any2.h | 4 | ||||
| -rw-r--r-- | include/uno/dispatcher.h | 4 | ||||
| -rw-r--r-- | include/uno/environment.h | 4 | ||||
| -rw-r--r-- | include/uno/mapping.h | 4 |
4 files changed, 8 insertions, 8 deletions
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 |