Kaydet (Commit) 92ed9161 authored tarafından Thorsten Behrens's avatar Thorsten Behrens

sal: WNT -> _WIN32

Still some holdouts from that bad old habit it seems.

Change-Id: Ib0fe2c7eb006649b121668c549ff8e0bb060e120
Reviewed-on: https://gerrit.libreoffice.org/55331Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
üst 9065ec06
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#if defined ANDROID #if defined ANDROID
#include <android/log.h> #include <android/log.h>
#elif defined WNT #elif defined _WIN32
#include <process.h> #include <process.h>
#include <windows.h> #include <windows.h>
#define OSL_DETAIL_GETPID _getpid() #define OSL_DETAIL_GETPID _getpid()
...@@ -101,7 +101,7 @@ char const * getEnvironmentVariable(const char* env) { ...@@ -101,7 +101,7 @@ char const * getEnvironmentVariable(const char* env) {
return p2; return p2;
} }
#ifdef WNT #ifdef _WIN32
# define INI_STRINGBUF_SIZE 1024 # define INI_STRINGBUF_SIZE 1024
bool getValueFromLoggingIniFile(const char* key, char* value) { bool getValueFromLoggingIniFile(const char* key, char* value) {
...@@ -144,7 +144,7 @@ char const * getLogLevel() { ...@@ -144,7 +144,7 @@ char const * getLogLevel() {
if (env != nullptr) if (env != nullptr)
return env; return env;
#ifdef WNT #ifdef _WIN32
static char logLevel[INI_STRINGBUF_SIZE]; static char logLevel[INI_STRINGBUF_SIZE];
if (getValueFromLoggingIniFile("LogLevel", logLevel)) if (getValueFromLoggingIniFile("LogLevel", logLevel))
return logLevel; return logLevel;
...@@ -159,7 +159,7 @@ std::ofstream * getLogFile() { ...@@ -159,7 +159,7 @@ std::ofstream * getLogFile() {
if (!logFile) if (!logFile)
{ {
#ifdef WNT #ifdef _WIN32
static char logFilePath[INI_STRINGBUF_SIZE]; static char logFilePath[INI_STRINGBUF_SIZE];
if (getValueFromLoggingIniFile("LogFilePath", logFilePath)) if (getValueFromLoggingIniFile("LogFilePath", logFilePath))
logFile = logFilePath; logFile = logFilePath;
...@@ -331,7 +331,7 @@ void sal_detail_log( ...@@ -331,7 +331,7 @@ void sal_detail_log(
*logFile << s.str() << std::endl; *logFile << s.str() << std::endl;
} }
else { else {
#ifdef WNT #ifdef _WIN32
// write to Windows debugger console, too // write to Windows debugger console, too
OutputDebugStringA(s.str().c_str()); OutputDebugStringA(s.str().c_str());
#endif #endif
......
...@@ -5105,7 +5105,7 @@ namespace osl_Directory ...@@ -5105,7 +5105,7 @@ namespace osl_Directory
rc != osl::FileBase::E_None rc != osl::FileBase::E_None
); );
} }
#endif /* WNT */ #endif /* _WIN32 */
CPPUNIT_TEST_SUITE(createPath); CPPUNIT_TEST_SUITE(createPath);
CPPUNIT_TEST(with_relative_path); CPPUNIT_TEST(with_relative_path);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment