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 /rsc | |
| 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 'rsc')
| -rw-r--r-- | rsc/source/rscpp/cpp.h | 2 | ||||
| -rw-r--r-- | rsc/source/rscpp/cpp3.c | 2 | ||||
| -rw-r--r-- | rsc/source/tools/rsctools.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h index ca2464c73e76..0114c2914c01 100644 --- a/rsc/source/rscpp/cpp.h +++ b/rsc/source/rscpp/cpp.h @@ -247,7 +247,7 @@ int rscpp_main( int argc, char **argv ); #endif #define MAIN rscpp_main /* fuer die cpp.lib muss main() geandert werden */ #else -#ifdef WNT +#ifdef _WIN32 #define MAIN __cdecl main #else #define MAIN main diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c index 9bc16eaeb19c..e836b3d22aa5 100644 --- a/rsc/source/rscpp/cpp3.c +++ b/rsc/source/rscpp/cpp3.c @@ -107,7 +107,7 @@ void setincdirs() * verwendete knallte es in strcpy() ! */ -#if !defined( WNT ) && ! defined UNX +#if !defined(_WIN32) && !defined(UNX) extern char* getenv( char *pStr ); /* BP */ #endif char* pIncGetEnv = NULL; /* Pointer auf INCLUDE */ diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx index 09307c1bfcea..9c206f5eedab 100644 --- a/rsc/source/tools/rsctools.cxx +++ b/rsc/source/tools/rsctools.cxx @@ -20,7 +20,7 @@ #include <stdlib.h> #include <stdio.h> -#if defined (WNT ) +#if defined(_WIN32) #include <direct.h> #endif #include <string.h> |