sal/osl/all/log.cxx | 10 +++++-----
sal/qa/osl/file/osl_File.cxx | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 32d67237f41f91baea5cc61a59619a125c7780ac
Author: Thorsten Behrens <thorsten.behr...@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
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index b231b94591bf..18c0e3e124fc 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -31,7 +31,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;
@@ -334,7 +334,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 6ba45804f706..f89b6db6c86c 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -5003,7 +5003,7 @@ namespace osl_Directory
rc != FileBase::E_None
);
}
-#endif /* WNT */
+#endif /* _WIN32 */
CPPUNIT_TEST_SUITE(createPath);
CPPUNIT_TEST(with_relative_path);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
