Commit b7cc9dff authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Addendum to commit #16651.

parent e1b81fed

e_os.h

+8 −0
Original line number Diff line number Diff line
@@ -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>

util/pl/VC-32.pl

+4 −3
Original line number Diff line number Diff line
@@ -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";