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/osl | |
| 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/osl')
| -rw-r--r-- | include/osl/module.h | 2 | ||||
| -rw-r--r-- | include/osl/process.h | 4 | ||||
| -rw-r--r-- | include/osl/signal.h | 4 | ||||
| -rw-r--r-- | include/osl/time.h | 4 |
4 files changed, 7 insertions, 7 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 |