[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openssl-cvs
Subject:    [CVS] OpenSSL: OpenSSL_0_9_8-stable: openssl/ e_os.h openssl/util/pl/ ...
From:       "Andy Polyakov" <appro () openssl ! org>
Date:       2007-10-13 12:38:37
Message-ID: 20071013123837.E3FBC1EAE806 () master ! openssl ! org
[Download RAW message or body]

  OpenSSL CVS Repository
  http://cvs.openssl.org/
  ____________________________________________________________________________

  Server: cvs.openssl.org                  Name:   Andy Polyakov
  Root:   /v/openssl/cvs                   Email:  appro@openssl.org
  Module: openssl                          Date:   13-Oct-2007 14:38:37
  Branch: OpenSSL_0_9_8-stable             Handle: 2007101313383700

  Modified files:           (Branch: OpenSSL_0_9_8-stable)
    openssl                 e_os.h
    openssl/util/pl         VC-32.pl

  Log:
    Make it possible to link VC static lib with either /MT or /MD application
    [from HEAD].
    PR: 1230

  Summary:
    Revision    Changes     Path
    1.78.2.11   +8  -0      openssl/e_os.h
    1.16.2.23   +8  -5      openssl/util/pl/VC-32.pl
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/e_os.h
  ============================================================================
  $ cvs diff -u -r1.78.2.10 -r1.78.2.11 e_os.h
  --- openssl/e_os.h	22 Sep 2005 20:39:25 -0000	1.78.2.10
  +++ openssl/e_os.h	13 Oct 2007 12:38:37 -0000	1.78.2.11
  @@ -277,6 +277,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.16.2.22 -r1.16.2.23 VC-32.pl
  --- openssl/util/pl/VC-32.pl	19 Jul 2007 17:39:07 -0000	1.16.2.22
  +++ openssl/util/pl/VC-32.pl	13 Oct 2007 12:38:37 -0000	1.16.2.23
  @@ -31,8 +31,10 @@
       $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
  -    $opt_cflags=' /MD /Ox';
  -    $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG';
  +    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";
       }
   elsif ($FLAVOR =~ /CE/)
  @@ -94,8 +96,10 @@
       $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
  -    $opt_cflags=' /MD /Ox /O2 /Ob2';
  -    $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG';
  +    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";
       }
   $mlflags='';
  @@ -203,7 +207,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-cvs@openssl.org
Automated List Manager                           majordomo@openssl.org


[prev in list] [next in list] [prev in thread] [next in thread]