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 /cppu | |
| 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 'cppu')
| -rw-r--r-- | cppu/source/typelib/static_types.cxx | 4 | ||||
| -rw-r--r-- | cppu/source/typelib/typelib.cxx | 4 | ||||
| -rw-r--r-- | cppu/source/uno/check.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx index 9b882afc6d22..eabd3950450f 100644 --- a/cppu/source/typelib/static_types.cxx +++ b/cppu/source/typelib/static_types.cxx @@ -42,7 +42,7 @@ extern "C" { -#ifdef SAL_W32 +#ifdef _WIN32 #pragma pack(push, 8) #endif @@ -65,7 +65,7 @@ struct AlignSize_Impl #endif }; -#ifdef SAL_W32 +#ifdef _WIN32 #pragma pack(pop) #endif diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index bf44d6a850dc..8d842cc40a4f 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -47,7 +47,7 @@ using ::rtl::OUString; using ::rtl::OUStringBuffer; using ::rtl::OString; -#ifdef SAL_W32 +#ifdef _WIN32 #pragma pack(push, 8) #endif @@ -70,7 +70,7 @@ struct AlignSize_Impl #endif }; -#ifdef SAL_W32 +#ifdef _WIN32 #pragma pack(pop) #endif diff --git a/cppu/source/uno/check.cxx b/cppu/source/uno/check.cxx index 353e2c977493..e92d7616fa33 100644 --- a/cppu/source/uno/check.cxx +++ b/cppu/source/uno/check.cxx @@ -29,7 +29,7 @@ namespace { -#if defined( SAL_W32) +#if defined( _WIN32) #pragma pack(push, 8) #endif @@ -143,7 +143,7 @@ enum Enum v = SAL_MAX_ENUM }; -#ifdef SAL_W32 +#ifdef _WIN32 # pragma pack(pop) #endif |