summaryrefslogtreecommitdiff
path: root/desktop/source/deployment/misc
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/source/deployment/misc')
-rw-r--r--desktop/source/deployment/misc/dp_misc.cxx12
-rw-r--r--desktop/source/deployment/misc/lockfile.cxx4
2 files changed, 8 insertions, 8 deletions
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 949d76211b4f..9930d6a70c84 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -46,7 +46,7 @@
#include <comphelper/processfactory.hxx>
#include <salhelper/linkhelper.hxx>
-#ifdef WNT
+#ifdef _WIN32
#define UNICODE
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@@ -55,7 +55,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-#if defined WNT
+#if defined(_WIN32)
#define SOFFICE1 "soffice.exe"
#define SBASE "sbase.exe"
#define SCALC "scalc.exe"
@@ -467,7 +467,7 @@ Reference<XInterface> resolveUnoURL(
return nullptr; // warning C4715
}
-#ifdef WNT
+#ifdef _WIN32
void writeConsoleWithStream(OUString const & sText, HANDLE stream)
{
DWORD nWrittenChars = 0;
@@ -485,7 +485,7 @@ void writeConsoleWithStream(OUString const & sText, FILE * stream)
void writeConsole(OUString const & sText)
{
-#ifdef WNT
+#ifdef _WIN32
writeConsoleWithStream(sText, GetStdHandle(STD_OUTPUT_HANDLE));
#else
writeConsoleWithStream(sText, stdout);
@@ -494,7 +494,7 @@ void writeConsole(OUString const & sText)
void writeConsoleError(OUString const & sText)
{
-#ifdef WNT
+#ifdef _WIN32
writeConsoleWithStream(sText, GetStdHandle(STD_ERROR_HANDLE));
#else
writeConsoleWithStream(sText, stderr);
@@ -503,7 +503,7 @@ void writeConsoleError(OUString const & sText)
OUString readConsole()
{
-#ifdef WNT
+#ifdef _WIN32
sal_Unicode aBuffer[1024];
DWORD dwRead = 0;
//unopkg.com feeds unopkg.exe with wchar_t|s
diff --git a/desktop/source/deployment/misc/lockfile.cxx b/desktop/source/deployment/misc/lockfile.cxx
index 197ce6a49b0a..f33cd703fa5d 100644
--- a/desktop/source/deployment/misc/lockfile.cxx
+++ b/desktop/source/deployment/misc/lockfile.cxx
@@ -19,7 +19,7 @@
#include <stdlib.h>
#include <time.h>
-#ifndef WNT
+#ifndef _WIN32
#include <unistd.h>
#else
#include <windows.h>
@@ -41,7 +41,7 @@ using namespace ::utl;
static OString impl_getHostname()
{
OString aHost;
-#ifdef WNT
+#ifdef _WIN32
/*
prevent windows from connecting to the net to get its own
hostname by using the netbios name