summaryrefslogtreecommitdiff
path: root/include/tools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-02-16 14:14:43 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-02-17 11:33:57 +0000
commit2087484c65a3d5e75a9e8ad116d11a4e13366219 (patch)
tree1f335918a854319df9269329d165a91d711d2108 /include/tools
parentd6bf086012343b4a1e27cd4242dced9ee0d73a06 (diff)
use consistent #define checks for the Windows platform
stage 2 of replacing usage of various checks for the windows platform with the compiler-defined '_WIN32' macro In this stage we focus on replacing usage of the WIN macro Change-Id: Ie8a4a63198a6de96bd158ecd707dadafb9c8ea84 Reviewed-on: https://gerrit.libreoffice.org/22393 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/tools')
-rw-r--r--include/tools/lineend.hxx2
-rw-r--r--include/tools/pathutils.hxx2
-rw-r--r--include/tools/solar.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/tools/lineend.hxx b/include/tools/lineend.hxx
index 2682d5d210cd..165d8b549513 100644
--- a/include/tools/lineend.hxx
+++ b/include/tools/lineend.hxx
@@ -18,7 +18,7 @@ enum LineEnd { LINEEND_CR, LINEEND_LF, LINEEND_CRLF };
inline LineEnd GetSystemLineEnd()
{
-#if defined WNT
+#if defined(_WIN32)
return LINEEND_CRLF;
#else
return LINEEND_LF;
diff --git a/include/tools/pathutils.hxx b/include/tools/pathutils.hxx
index ddb9852fe61b..3fa5cc0d1e9d 100644
--- a/include/tools/pathutils.hxx
+++ b/include/tools/pathutils.hxx
@@ -21,7 +21,7 @@
#include <sal/config.h>
-#if defined WNT
+#if defined(_WIN32)
#include <cstddef>
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
diff --git a/include/tools/solar.h b/include/tools/solar.h
index e349024fd9d7..e503f38fd908 100644
--- a/include/tools/solar.h
+++ b/include/tools/solar.h
@@ -106,7 +106,7 @@ inline void DoubleToSVBT64( double n, SVBT64 p ) { p[0] = reinterpret_cast<s
#endif
#endif
-#if defined WNT
+#if defined(_WIN32)
#define SVLIBRARY( Base ) Base "lo.dll"
#elif defined MACOSX
#define SVLIBRARY( Base ) "lib" Base "lo.dylib"