[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sal/osl sal/qa

[Thorsten Behrens]

 sal/osl/all/log.cxx          |   10 +++++-----
 sal/qa/osl/file/osl_File.cxx |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit aa89c1d03e2fa6b314bda5094235ef02ec237fb3
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Tue Jun 5 14:23:08 2018 +0200

    sal: WNT -> _WIN32
    
    Still some holdouts from that bad old habit it seems.
    
    Change-Id: Ib0fe2c7eb006649b121668c549ff8e0bb060e120
    Reviewed-on: https://gerrit.libreoffice.org/55331
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 92ed91610d30246e671226da081da748f6b16aae)
    Reviewed-on: https://gerrit.libreoffice.org/55341

diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 4b6016e00951..d5c77dfb5750 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -32,7 +32,7 @@
 
 #if defined ANDROID
 #include <android/log.h>
-#elif defined WNT
+#elif defined _WIN32
 #include <process.h>
 #include <windows.h>
 #define OSL_DETAIL_GETPID _getpid()
@@ -101,7 +101,7 @@ char const * getEnvironmentVariable(const char* env) {
     return p2;
 }
 
-#ifdef WNT
+#ifdef _WIN32
 # define INI_STRINGBUF_SIZE 1024
 
 bool getValueFromLoggingIniFile(const char* key, char* value) {
@@ -144,7 +144,7 @@ char const * getLogLevel() {
     if (env != nullptr)
         return env;
 
-#ifdef WNT
+#ifdef _WIN32
     static char logLevel[INI_STRINGBUF_SIZE];
     if (getValueFromLoggingIniFile("LogLevel", logLevel))
         return logLevel;
@@ -159,7 +159,7 @@ std::ofstream * getLogFile() {
 
     if (!logFile)
     {
-#ifdef WNT
+#ifdef _WIN32
         static char logFilePath[INI_STRINGBUF_SIZE];
         if (getValueFromLoggingIniFile("LogFilePath", logFilePath))
             logFile = logFilePath;
@@ -331,7 +331,7 @@ void sal_detail_log(
             *logFile << s.str() << std::endl;
         }
         else {
-#ifdef WNT
+#ifdef _WIN32
             // write to Windows debugger console, too
             OutputDebugStringA(s.str().c_str());
 #endif
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index e853fb135cc5..1cc32f751331 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -5105,7 +5105,7 @@ namespace osl_Directory
                 rc != osl::FileBase::E_None
           );
         }
-#endif /* WNT */
+#endif /* _WIN32 */
 
     CPPUNIT_TEST_SUITE(createPath);
         CPPUNIT_TEST(with_relative_path);