summaryrefslogtreecommitdiff
path: root/desktop/source
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/source')
-rw-r--r--desktop/source/app/app.cxx2
-rw-r--r--desktop/source/app/crashreport.cxx8
-rw-r--r--desktop/source/app/officeipcthread.cxx2
-rw-r--r--desktop/source/app/updater.cxx2
4 files changed, 7 insertions, 7 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index b125883951b6..16f62e9f64a5 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1960,7 +1960,7 @@ void Desktop::OpenClients()
+ utl::ConfigManager::getUILocale();
#if defined UNX
aHelpURL += "&System=UNX";
-#elif defined WNT
+#elif defined _WIN32
aHelpURL += "&System=WIN";
#endif
Application::GetHelp()->Start(aHelpURL, static_cast<const vcl::Window*>(nullptr));
diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx
index 743ae43e7c9b..432be67cdcd3 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -27,7 +27,7 @@
#include <fstream>
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
#include <client/linux/handler/exception_handler.h>
-#elif defined WNT
+#elif defined _WIN32
#if defined __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wmicrosoft-enum-value"
@@ -54,7 +54,7 @@ static bool dumpCallback(const google_breakpad::MinidumpDescriptor& descriptor,
return succeeded;
}
-#elif defined WNT
+#elif defined _WIN32
static bool dumpCallback(const wchar_t* path, const wchar_t* id,
void* /*context*/, EXCEPTION_POINTERS* /*exinfo*/,
MDRawAssertionInfo* /*assertion*/,
@@ -176,7 +176,7 @@ void CrashReporter::updateMinidumpLocation()
OString aOStringUrl = OUStringToOString(aURL, RTL_TEXTENCODING_UTF8);
google_breakpad::MinidumpDescriptor descriptor(aOStringUrl.getStr());
mpExceptionHandler->set_minidump_descriptor(descriptor);
-#elif defined WNT
+#elif defined _WIN32
OUString aURL = getCrashDirectory();
mpExceptionHandler->set_dump_path(o3tl::toW(aURL.getStr()));
#endif
@@ -208,7 +208,7 @@ void CrashReporter::installExceptionHandler()
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
google_breakpad::MinidumpDescriptor descriptor("/tmp");
mpExceptionHandler = std::make_unique<google_breakpad::ExceptionHandler>(descriptor, nullptr, dumpCallback, nullptr, true, -1);
-#elif defined WNT
+#elif defined _WIN32
mpExceptionHandler = std::make_unique<google_breakpad::ExceptionHandler>(L".", nullptr, dumpCallback, nullptr, google_breakpad::ExceptionHandler::HANDLER_ALL);
#endif
}
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 16ec688c7c36..0c3296ebad4f 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -1080,7 +1080,7 @@ bool IpcThread::process(OString const & arguments, bool * waitProcessed) {
aHelpURLBuffer.append(utl::ConfigManager::getUILocale());
#if defined UNX
aHelpURLBuffer.append("&System=UNX");
-#elif defined WNT
+#elif defined _WIN32
aHelpURLBuffer.append("&System=WIN");
#endif
ApplicationEvent* pAppEvent = new ApplicationEvent(
diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index ea9be47a8348..2d99856b2174 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -72,7 +72,7 @@ static const char kUserAgent[] = "LibreOffice UpdateChecker/1.0 (unknown platfor
#ifdef UNX
const char* const pUpdaterName = "updater";
const char* const pSofficeExeName = "soffice";
-#elif defined(WNT)
+#elif defined(_WIN32)
const char* pUpdaterName = "updater.exe";
const char* pSofficeExeName = "soffice.exe";
#else