diff options
| author | Bruno Haible <bruno@clisp.org> | 2006-05-17 10:39:57 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:13:21 +0200 |
| commit | 805ddcc2b89e0483abb1da60d7cba69dfa4e402e (patch) | |
| tree | edf828e6653bf87bba6162b659c9fdfcad748c65 /gettext-tools/lib/localcharset.c | |
| parent | 1247d933bbbd43310eb32d90214086085a0e8472 (diff) | |
| download | external_gettext-805ddcc2b89e0483abb1da60d7cba69dfa4e402e.zip external_gettext-805ddcc2b89e0483abb1da60d7cba69dfa4e402e.tar.gz external_gettext-805ddcc2b89e0483abb1da60d7cba69dfa4e402e.tar.bz2 | |
Cygwin defines WIN32 in <windows.h>!
Diffstat (limited to 'gettext-tools/lib/localcharset.c')
| -rw-r--r-- | gettext-tools/lib/localcharset.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gettext-tools/lib/localcharset.c b/gettext-tools/lib/localcharset.c index e4e81ca..e8505bf 100644 --- a/gettext-tools/lib/localcharset.c +++ b/gettext-tools/lib/localcharset.c @@ -41,8 +41,7 @@ #endif #if defined _WIN32 || defined __WIN32__ -# undef WIN32 /* avoid warning on mingw32 */ -# define WIN32 +# define WIN32_NATIVE #endif #if defined __EMX__ @@ -50,7 +49,7 @@ # define OS2 #endif -#if !defined WIN32 +#if !defined WIN32_NATIVE # if HAVE_LANGINFO_CODESET # include <langinfo.h> # else @@ -62,7 +61,7 @@ # define WIN32_LEAN_AND_MEAN # include <windows.h> # endif -#elif defined WIN32 +#elif defined WIN32_NATIVE # define WIN32_LEAN_AND_MEAN # include <windows.h> #endif @@ -118,7 +117,7 @@ get_charset_aliases (void) cp = charset_aliases; if (cp == NULL) { -#if !(defined VMS || defined WIN32 || defined __CYGWIN__) +#if !(defined VMS || defined WIN32_NATIVE || defined __CYGWIN__) FILE *fp; const char *dir; const char *base = "charset.alias"; @@ -244,7 +243,7 @@ get_charset_aliases (void) "DECKOREAN" "\0" "EUC-KR" "\0"; # endif -# if defined WIN32 || defined __CYGWIN__ +# if defined WIN32_NATIVE || defined __CYGWIN__ /* To avoid the troubles of installing a separate file in the same directory as the DLL and of retrieving the DLL's directory at runtime, simply inline the aliases here. */ @@ -296,7 +295,7 @@ locale_charset (void) const char *codeset; const char *aliases; -#if !(defined WIN32 || defined OS2) +#if !(defined WIN32_NATIVE || defined OS2) # if HAVE_LANGINFO_CODESET @@ -380,7 +379,7 @@ locale_charset (void) # endif -#elif defined WIN32 +#elif defined WIN32_NATIVE static char buf[2 + 10 + 1]; |