From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 9 Mar 2009 12:30:10 +0000 (+0000)
Subject: Update from stable branch.
X-Git-Tag: OpenSSL_0_9_8k^2~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c836f8ef73c497d733be3cb9d57fc47734f99b0a;p=oweals%2Fopenssl.git

Update from stable branch.
---

diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c
index 472dd75821..30c3ceab46 100644
--- a/crypto/bio/bss_sock.c
+++ b/crypto/bio/bss_sock.c
@@ -60,6 +60,9 @@
 #include <errno.h>
 #define USE_SOCKETS
 #include "cryptlib.h"
+
+#ifndef OPENSSL_NO_SOCK
+
 #include <openssl/bio.h>
 
 #ifdef WATT32
@@ -300,3 +303,5 @@ int BIO_sock_non_fatal_error(int err)
 		}
 	return(0);
 	}
+
+#endif  /* #ifndef OPENSSL_NO_SOCK */
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index a20e73566b..d16ec7877a 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -162,7 +162,7 @@ else
 	}
 
 # static library stuff
-$mklib='lib';
+$mklib='lib /nologo';
 $ranlib='';
 $plib="";
 $libp=".lib";
@@ -193,7 +193,7 @@ if ($FLAVOR =~ /WIN64A/) {
 	$asmtype="win32n";
 	$afile='-o ';
 } else {
-	$asm='ml /Cp /coff /c /Cx';
+	$asm='ml /nologo /Cp /coff /c /Cx';
 	$asm.=" /Zi" if $debug;
 	$afile='/Fo';
 	$asmtype="win32";