WINDOWS is defined in e_os.h. The problem was WIN32 (the new egcs uses _WIN32).

diff --git a/Configure b/Configure
index 2c17bf39ca1d6dfdbf687f00f2bcc26d36c2fe67..c96d0b236bdca4d87c91e94c2a1830f7360d0b1b 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -298,8 +298,8 @@ my %table=(
 # CygWin32
 # (Note: the real CFLAGS for Windows builds are defined by util/mk1mf.pl
 # and its library files in util/pl/*)
-"CygWin32", "gcc:-DTERMIOS -DL_ENDIAN -DWINDOWS -fomit-frame-pointer -O3 -m486 -Wall::::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
-"Mingw32", "gcc:-DL_ENDIAN -DWINDOWS -fomit-frame-pointer -O3 -m486 -Wall::::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
+"CygWin32", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
+"Mingw32", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
 
 # Ultrix from Bernhard Simon <simon@zid.tuwien.ac.at>
 "ultrix-cc","cc:-std1 -O -Olimit 1000 -DL_ENDIAN::(unknown)::::::",

diff --git a/e_os.h b/e_os.h
index fa2a117762b7ef1519cdfeddbb752cd0513861e9..d23ab54aaf18b4591a7d2fd9e77ad306107a2861 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -107,6 +107,10 @@ extern "C" {
 #  define MS_STATIC
 #endif
 
+#if defined(_WIN32) && !defined(WIN32)
+#  define WIN32
+#endif
+
 #if defined(WIN32) || defined(WIN16)
 #  ifndef WINDOWS
 #    define WINDOWS

diff --git a/util/pl/Mingw32.pl b/util/pl/Mingw32.pl
index 8a4a0f25642db74cea4780d8efeeca188d91248f..585cacd82035f38954686303eafacbd689984bed 100644 (file)
--- a/util/pl/Mingw32.pl
+++ b/util/pl/Mingw32.pl
@@ -17,9 +17,9 @@ $mkdir='gmkdir';
 
 $cc='gcc';
 if ($debug)
-       { $cflags="-DL_ENDIAN -DWINDOWS -g2 -ggdb"; }
+       { $cflags="-DL_ENDIAN -g2 -ggdb"; }
 else
-       { $cflags="-DL_ENDIAN -DWINDOWS -fomit-frame-pointer -O3 -m486 -Wall"; }
+       { $cflags="-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall"; }
 
 $obj='.o';
 $ofile='-o ';

diff --git a/util/pl/Mingw32f.pl b/util/pl/Mingw32f.pl
index 9755d1b266cbaaf27885396b951d99d0df0e59f5..a53c537646cb2a9b8eade2bd6c4b9d7998cad9d6 100644 (file)
--- a/util/pl/Mingw32f.pl
+++ b/util/pl/Mingw32f.pl
@@ -11,9 +11,9 @@ $rm='del';
 
 $cc='gcc';
 if ($debug)
-       { $cflags="-DWINDOWS -g2 -ggdb"; }
+       { $cflags="-g2 -ggdb"; }
 else
-       { $cflags="-DWINDOWS -O3 -fomit-frame-pointer"; }
+       { $cflags="-O3 -fomit-frame-pointer"; }
 
 $obj='.o';
 $ofile='-o ';