diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-16 11:26:51 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-16 10:37:55 +0000 |
| commit | ce43d0ae9279edbf1ad108fe0d8325327a038d49 (patch) | |
| tree | a0fbf7bbd608d1185005a0de36496c6f3656e798 /soltools | |
| parent | 049cf885c6e6c12ac9fa20bcb4ca1472de5b9115 (diff) | |
use consistent #define checks for the Windows platform
stage 1 of replacing usage of various checks for the windows platform
with the compiler-defined '_WIN32' macro
Change-Id: Iece73abdee530937e0737190b1aa97a46cd3075f
Reviewed-on: https://gerrit.libreoffice.org/22390
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'soltools')
| -rw-r--r-- | soltools/mkdepend/def.h | 2 | ||||
| -rw-r--r-- | soltools/mkdepend/ifparser.c | 2 | ||||
| -rw-r--r-- | soltools/mkdepend/imakemdep.h | 10 | ||||
| -rw-r--r-- | soltools/mkdepend/main.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h index fbe603280f55..74445a2ed130 100644 --- a/soltools/mkdepend/def.h +++ b/soltools/mkdepend/def.h @@ -29,7 +29,7 @@ in this Software without prior written authorization from the X Consortium. #ifndef NO_X11 #include <X11/Xosdefs.h> -#ifdef WIN32 +#ifdef _WIN32 #include <X11/Xw32defs.h> #endif #ifndef SUNOS4 diff --git a/soltools/mkdepend/ifparser.c b/soltools/mkdepend/ifparser.c index 39d36426279b..274a72a7fce8 100644 --- a/soltools/mkdepend/ifparser.c +++ b/soltools/mkdepend/ifparser.c @@ -96,7 +96,7 @@ parse_number (IfParser *g, const char *cp, int *valp) if (!isdigit(*cp)) return CALLFUNC(g, handle_error) (g, cp, "number"); -#ifdef WIN32 +#ifdef _WIN32 { char *cp2; *valp = strtol(cp, &cp2, 0); diff --git a/soltools/mkdepend/imakemdep.h b/soltools/mkdepend/imakemdep.h index 5252d27cce45..6211da6c322d 100644 --- a/soltools/mkdepend/imakemdep.h +++ b/soltools/mkdepend/imakemdep.h @@ -118,7 +118,7 @@ in this Software without prior written authorization from the X Consortium. #define imake_ccflags "-DX_NOT_POSIX" #endif -#ifdef WIN32 +#ifdef _WIN32 #define imake_ccflags "-nologo -batch -D__STDC__" #endif @@ -174,10 +174,10 @@ in this Software without prior written authorization from the X Consortium. * all colons). One way to tell if you need this is to see whether or not * your Makefiles have no tabs in them and lots of @@ strings. */ -#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || (defined(AMOEBA) && defined(CROSS_COMPILE)) +#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(_WIN32) || (defined(AMOEBA) && defined(CROSS_COMPILE)) #define FIXUP_CPP_WHITESPACE #endif -#ifdef WIN32 +#ifdef _WIN32 #define REMOVE_CPP_LEADSPACE #define INLINE_SYNTAX #define MAGIC_MAKE_VARS @@ -192,7 +192,7 @@ in this Software without prior written authorization from the X Consortium. * If use cc -E but want a different compiler, define DEFAULT_CC. * If the cpp you need is not in /lib/cpp, define DEFAULT_CPP. */ -#ifdef WIN32 +#ifdef _WIN32 #define USE_CC_E #define DEFAULT_CC "cl" #endif @@ -433,7 +433,7 @@ char *cpp_argv[ARGUMENTS] = { "-DSVR4", #endif #endif -#ifdef WIN32 +#ifdef _WIN32 "-DWIN32", "-nologo", "-batch", diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c index 3641f4fb7fc0..8b514287e3b0 100644 --- a/soltools/mkdepend/main.c +++ b/soltools/mkdepend/main.c @@ -147,7 +147,7 @@ catch (int sig) fatalerr ("got signal %d\n", sig); } -#if (defined(i386) && defined(SYSV)) || defined(WIN32) +#if (defined(i386) && defined(SYSV)) || defined(_WIN32) #define USGISH #endif |