diff options
| author | Andy Polyakov <appro@openssl.org> | 2007-10-07 16:34:59 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2007-10-07 16:34:59 +0200 |
| commit | b7cc9dffacab3c9abb0acd059df72a2136e0eda0 (patch) | |
| tree | f26399a3b69da1cba6be735ec384f4a0eb88ff54 | |
| parent | Make it possible to link VC static lib with either /MT or /MD application. (diff) | |
| download | openssl-b7cc9dffacab3c9abb0acd059df72a2136e0eda0.tar.xz openssl-b7cc9dffacab3c9abb0acd059df72a2136e0eda0.zip | |
Addendum to commit #16651.
| -rw-r--r-- | e_os.h | 8 | ||||
| -rw-r--r-- | util/pl/VC-32.pl | 7 |
2 files changed, 12 insertions, 3 deletions
@@ -293,6 +293,14 @@ static unsigned int _strlen31(const char *str) } # endif # include <malloc.h> +# if defined(_MSC_VER) && _MSC_VER<=1200 && defined(_MT) && defined(isspace) + /* compensate for bug is VC6 ctype.h */ +# undef isspace +# undef isdigit +# undef isalnum +# undef isupper +# undef isxdigit +# endif # endif # include <io.h> # include <fcntl.h> diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index ae2efe2a48..dfde1aa2b1 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -31,7 +31,8 @@ if ($FLAVOR =~ /WIN64/) $base_cflags=' /W3 /Gs0 /GF /Gy /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE'; $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8 $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8 - my $f = $shlib?' /MD':' /Zl /MT'; + my $f = $shlib?' /MD':' /MT'; + $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib $opt_cflags=$f.' /Ox'; $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; $lflags="/nologo /subsystem:console /opt:ref"; @@ -97,7 +98,8 @@ else # Win32 $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32'; $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8 $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8 - my $f = $shlib?' /MD':' /Zl /MT'; + my $f = $shlib?' /MD':' /MT'; + $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib $opt_cflags=$f.' /Ox /O2 /Ob2'; $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; $lflags="/nologo /subsystem:console /opt:ref"; @@ -206,7 +208,6 @@ if (!$no_asm) if ($shlib && $FLAVOR !~ /CE/) { $mlflags.=" $lflags /dll"; -# $cflags =~ s| /MD| /MT|; $lib_cflag=" -D_WINDLL"; $out_def="out32dll"; $tmp_def="tmp32dll"; |