OpenSSL: openssl/ e_os.h openssl/util/pl/ VC-32.pl

  OpenSSL CVS Repository
  http://cvs.openssl.org/
 
____________________________________________________________
________________

  Server: cvs.openssl.org                  Name:   Andy
Polyakov
  Root:   /v/openssl/cvs                   Email:  approopenssl.org
  Module: openssl                          Date:  
07-Oct-2007 16:34:59
  Branch: HEAD                             Handle:
2007100715345900

  Modified files:
    openssl                 e_os.h
    openssl/util/pl         VC-32.pl

  Log:
    Addendum to commit #16651.

  Summary:
    Revision    Changes     Path
    1.96        +8  -0      openssl/e_os.h
    1.47        +4  -3      openssl/util/pl/VC-32.pl
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/e_os.h
 
============================================================
================
  $ cvs diff -u -r1.95 -r1.96 e_os.h
  --- openssl/e_os.h	23 Oct 2006 07:41:03 -0000	1.95
  +++ openssl/e_os.h	7 Oct 2007 14:34:59 -0000	1.96
   -293,6 +293,14 
   	}
   #    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>
   .
  patch -p0 <<' .'
  Index: openssl/util/pl/VC-32.pl
 
============================================================
================
  $ cvs diff -u -r1.46 -r1.47 VC-32.pl
  --- openssl/util/pl/VC-32.pl	7 Oct 2007 12:55:36
-0000	1.46
  +++ openssl/util/pl/VC-32.pl	7 Oct 2007 14:34:59
-0000	1.47
   -31,7 +31,8 
       $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 
       $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 ($shlib && $FLAVOR !~ /CE/)
   	{
   	$mlflags.=" $lflags /dll";
  -#	$cflags =~ s| /MD| /MT|;
   	$lib_cflag=" -D_WINDLL";
   	$out_def="out32dll";
   	$tmp_def="tmp32dll";
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org