diff options
| author | Ulf Möller <ulf@openssl.org> | 2000-01-20 23:59:24 +0000 |
|---|---|---|
| committer | Ulf Möller <ulf@openssl.org> | 2000-01-20 23:59:24 +0000 |
| commit | b838465135831bb1a23c10a59c89c21948da48df (patch) | |
| tree | 897fb53f29eea4d57bcaa1268abe25c4523219b4 | |
| parent | 6481f3d29ddda737c78761efe26da901ed57b7fb (diff) | |
| download | openssl-b838465135831bb1a23c10a59c89c21948da48df.tar.gz | |
WINDOWS is defined in e_os.h. The problem was WIN32 (the new egcs uses _WIN32).
| -rwxr-xr-x | Configure | 4 | ||||
| -rw-r--r-- | e_os.h | 4 | ||||
| -rw-r--r-- | util/pl/Mingw32.pl | 4 | ||||
| -rw-r--r-- | util/pl/Mingw32f.pl | 4 |
4 files changed, 10 insertions, 6 deletions
@@ -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)::::::", @@ -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 8a4a0f2564..585cacd820 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 9755d1b266..a53c537646 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 '; |