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/rtl | |
| 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/rtl')
| -rw-r--r-- | include/rtl/locale.h | 4 | ||||
| -rw-r--r-- | include/rtl/string.h | 4 | ||||
| -rw-r--r-- | include/rtl/ustring.h | 4 |
3 files changed, 6 insertions, 6 deletions
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 |