Commit 02620cfc authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Cumulative updates from HEAD.

parent 74daafaa

e_os.h

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ static unsigned int _strlen31(const char *str) 
#      undef isupper

#      undef isxdigit

#    endif

#    if defined(_MSC_VER) && !defined(_DLL) && defined(stdin)

#    if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && defined(stdin)

#      if _MSC_VER>=1300

#        undef stdin

#        undef stdout

util/mk1mf.pl

+1 −1
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ if ($fips) 
	{

	$rules.=&cc_compile_target("\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj",

		"\$(FIPS_PREMAIN_SRC)",

		"-DFINGERPRINT_PREMAIN_DSO_LOAD \$(SHLIB_CFLAGS)", "");

		"-DFINGERPRINT_PREMAIN_DSO_LOAD \$(APP_CFLAGS)", "");

	$rules.=&do_link_rule("\$(PREMAIN_DSO_EXE)","\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj \$(CRYPTOOBJ) \$(O_FIPSCANISTER)","","\$(EX_LIBS)", 1);

	}

util/pl/VC-32.pl

+10 −6
Original line number Diff line number Diff line
@@ -43,8 +43,7 @@ if ($FLAVOR =~ /WIN64/) 
    # considered safe to ignore.

    # 

    $base_cflags= " $mf_cflag";

    my $f = $shlib || $fips ?' /MD':' /MT';

    $lib_cflag='/Zl' if (!$shlib);	# remove /DEFAULTLIBs from static lib

    my $f = $shlib?' /MD':' /MT';

    $opt_cflags=$f.' /Ox';

    $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';

    $lflags="/nologo /subsystem:console /opt:ref";
@@ -117,19 +116,24 @@ elsif ($FLAVOR =~ /CE/) 
    $base_cflags.=" $wcecdefs";

    $base_cflags.=' -I$(WCECOMPAT)/include'		if (defined($ENV{'WCECOMPAT'}));

    $base_cflags.=' -I$(PORTSDK_LIBPATH)/../../include'	if (defined($ENV{'PORTSDK_LIBPATH'}));

    $opt_cflags=' /MC /O1i';	# optimize for space, but with intrinsics...

    $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG';

    if (`cl 2>&1` =~ /Version 1[4-9]\./) {

	$base_cflags.=($shlib and !$fipscanisterbuild)?' /MD':' /MT';

    } else {

	$base_cflags.=' /MC';

    }

    $opt_cflags=' /O1i';	# optimize for space, but with intrinsics...

    $dbg_clfags=' /Od -DDEBUG -D_DEBUG';

    $lflags="/nologo /opt:ref $wcelflag";

    }

else	# Win32

    {

    $base_cflags= " $mf_cflag";

    my $f = $shlib || $fips ?' /MD':' /MT';

    $lib_cflag='/Zl' if (!$shlib);	# remove /DEFAULTLIBs from static lib

    my $f = $shlib?' /MD':' /MT';

    $opt_cflags=$f.' /Ox /O2 /Ob2';

    $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';

    $lflags="/nologo /subsystem:console /opt:ref";

    }

$lib_cflags='/Zl' if (!$shlib);	# remove /DEFAULTLIBs from static lib

$mlflags='';



$out_def ="out32";	$out_def.="dll"			if ($shlib);