From b838465135831bb1a23c10a59c89c21948da48df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulf=20M=C3=B6ller?= <ulf@openssl.org>
Date: Thu, 20 Jan 2000 23:59:24 +0000
Subject: [PATCH] WINDOWS is defined in e_os.h. The problem was WIN32 (the new
egcs uses _WIN32).
---
Configure | 4 ++--
e_os.h | 4 ++++
util/pl/Mingw32.pl | 4 ++--
util/pl/Mingw32f.pl | 4 ++--
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Configure b/Configure
index 2c17bf39c..c96d0b236 100755
--- 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 fa2a11776..d23ab54aa 100644
--- 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 8a4a0f256..585cacd82 100644
--- 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 9755d1b26..a53c53764 100644
--- 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 ';