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 /idlc | |
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 'idlc')
-rw-r--r-- | idlc/source/idlccompile.cxx | 8 | ||||
-rw-r--r-- | idlc/source/idlcproduce.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx index 84f026a1db89..c2a4e045aea6 100644 --- a/idlc/source/idlccompile.cxx +++ b/idlc/source/idlccompile.cxx @@ -25,7 +25,7 @@ #include <osl/thread.h> #include <osl/file.hxx> -#if defined(SAL_W32) +#if defined(_WIN32) #include <io.h> #endif @@ -122,7 +122,7 @@ OString makeTempName(const OString& prefix) { if ( osl_getEnvironment(OUString("TEMP").pData, &uTmpPath.pData) != osl_Process_E_None ) { -#if defined(SAL_W32) +#if defined(_WIN32) tmpPath = OString("c:\\temp"); #else tmpPath = OString("/tmp"); @@ -133,7 +133,7 @@ OString makeTempName(const OString& prefix) if ( !uTmpPath.isEmpty() ) tmpPath = OUStringToOString(uTmpPath, RTL_TEXTENCODING_UTF8); -#if defined(SAL_W32) || defined(SAL_UNX) +#if defined(_WIN32) || defined(SAL_UNX) OSL_ASSERT( sizeof(tmpFilePattern) > static_cast<size_t>( tmpPath.getLength() @@ -302,7 +302,7 @@ sal_Int32 compileFile(const OString * pathname) sal_Int32 idx= cpp.lastIndexOf("idlc"); cpp = cpp.copy(0, idx); -#if defined(SAL_W32) +#if defined(_WIN32) cpp += "ucpp.exe"; #else cpp += "ucpp"; diff --git a/idlc/source/idlcproduce.cxx b/idlc/source/idlcproduce.cxx index 2fa0a3b0317b..81e6f3abc9e7 100644 --- a/idlc/source/idlcproduce.cxx +++ b/idlc/source/idlcproduce.cxx @@ -23,7 +23,7 @@ #include <osl/file.hxx> #include <osl/thread.h> -#if defined(SAL_W32) +#if defined(_WIN32) #include <io.h> #include <direct.h> #include <errno.h> |