diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-16 14:14:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-02-17 11:33:57 +0000 |
| commit | 2087484c65a3d5e75a9e8ad116d11a4e13366219 (patch) | |
| tree | 1f335918a854319df9269329d165a91d711d2108 /soltools | |
| parent | d6bf086012343b4a1e27cd4242dced9ee0d73a06 (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 'soltools')
| -rw-r--r-- | soltools/cpp/_unix.c | 4 | ||||
| -rw-r--r-- | soltools/mkdepend/collectdircontent.cxx | 4 | ||||
| -rw-r--r-- | soltools/mkdepend/collectdircontent.hxx | 2 | ||||
| -rw-r--r-- | soltools/mkdepend/main.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/soltools/cpp/_unix.c b/soltools/cpp/_unix.c index d68eed402074..1010e3084eb6 100644 --- a/soltools/cpp/_unix.c +++ b/soltools/cpp/_unix.c @@ -31,7 +31,7 @@ #include "cpp.h" -#if defined MACOSX || defined AIX || defined WNT +#if defined(MACOSX) || defined(AIX) || defined(_WIN32) #include <_getopt.h> #else #include <getopt.h> @@ -55,7 +55,7 @@ void Tokenrow tr; setup_kwtab(); -#if defined MACOSX || defined(AIX) || defined WNT +#if defined(MACOSX) || defined(AIX) || defined(_WIN32) while ((c = stgetopt(argc, argv, "NOPV:I:D:U:F:A:X:u:l:+")) != -1) #else while ((c = getopt(argc, argv, "NOPV:I:D:U:F:A:X:u:l:+")) != -1) diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx index c061e691c254..0041857ee879 100644 --- a/soltools/mkdepend/collectdircontent.cxx +++ b/soltools/mkdepend/collectdircontent.cxx @@ -18,7 +18,7 @@ PathFilePair IncludesCollection::split_path(const string& filePath) { void IncludesCollection::add_to_collection(const string& dirPath) { DirContent dirContent; -#if defined( WNT ) +#if defined(_WIN32) WIN32_FIND_DATA FindFileData; HANDLE hFind; hFind = FindFirstFile((dirPath + "\\*").c_str(), &FindFileData); @@ -50,7 +50,7 @@ void IncludesCollection::add_to_collection(const string& dirPath) { } bool IncludesCollection::exists(string filePath) { -#if defined( WNT ) +#if defined(_WIN32) transform(filePath.begin(), filePath.end(), filePath.begin(), ::tolower); #endif // defined( WNT ) PathFilePair dirFile = split_path(filePath); diff --git a/soltools/mkdepend/collectdircontent.hxx b/soltools/mkdepend/collectdircontent.hxx index 5eab3974771d..09a0ed518d1c 100644 --- a/soltools/mkdepend/collectdircontent.hxx +++ b/soltools/mkdepend/collectdircontent.hxx @@ -8,7 +8,7 @@ #include <map> #include <string> -#if defined( WNT ) +#if defined(_WIN32) #include <windows.h> #include <algorithm> #else diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c index 8b514287e3b0..85d43bc1327e 100644 --- a/soltools/mkdepend/main.c +++ b/soltools/mkdepend/main.c @@ -695,7 +695,7 @@ void warning1(char *msg, ...) void convert_slashes(char *path) { -#if defined (WNT) +#if defined (_WIN32) /* * Convert backslashes to slashes */ |