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 /codemaker | |
| 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 'codemaker')
| -rw-r--r-- | codemaker/source/codemaker/global.cxx | 2 | ||||
| -rw-r--r-- | codemaker/source/cppumaker/cpputype.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx index 512edab4fff7..daf031d7728d 100644 --- a/codemaker/source/codemaker/global.cxx +++ b/codemaker/source/codemaker/global.cxx @@ -26,7 +26,7 @@ #include <string.h> #include <errno.h> -#if defined(SAL_W32) +#if defined(_WIN32) # include <io.h> # include <direct.h> #endif diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index ba84a46b75f4..22711d444126 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -1813,7 +1813,7 @@ private: void PlainStructType::dumpDeclaration(FileStream & out) { - out << "\n#ifdef SAL_W32\n# pragma pack(push, 8)\n#endif\n\n" << indent(); + out << "\n#ifdef _WIN32\n# pragma pack(push, 8)\n#endif\n\n" << indent(); out << "struct SAL_DLLPUBLIC_RTTI "; if (canBeWarnUnused(name_)) out << "SAL_WARN_UNUSED "; @@ -1856,7 +1856,7 @@ void PlainStructType::dumpDeclaration(FileStream & out) } } dec(); - out << "};\n\n#ifdef SAL_W32\n# pragma pack(pop)\n#endif\n\n"; + out << "};\n\n#ifdef _WIN32\n# pragma pack(pop)\n#endif\n\n"; } void PlainStructType::dumpHppFile( @@ -2212,7 +2212,7 @@ private: void PolyStructType::dumpDeclaration(FileStream & out) { - out << "\n#ifdef SAL_W32\n# pragma pack(push, 8)\n#endif\n\n" << indent(); + out << "\n#ifdef _WIN32\n# pragma pack(push, 8)\n#endif\n\n" << indent(); dumpTemplateHead(out); out << "struct SAL_DLLPUBLIC_RTTI " << id_ << " {\n"; inc(); @@ -2248,7 +2248,7 @@ void PolyStructType::dumpDeclaration(FileStream & out) } } dec(); - out << "};\n\n#ifdef SAL_W32\n# pragma pack(pop)\n#endif\n\n"; + out << "};\n\n#ifdef _WIN32\n# pragma pack(pop)\n#endif\n\n"; } void PolyStructType::dumpHppFile( |