commit c836f8ef73c497d733be3cb9d57fc47734f99b0a
author Dr. Stephen Henson <steve@openssl.org> Mon Mar 09 12:30:10 2009 +0000
committer Dr. Stephen Henson <steve@openssl.org> Mon Mar 09 12:30:10 2009 +0000
tree 17af754f7b719f0a7f60b4f27e3469df9454bcf4
parent 4df100935f185476c4e84a68d0d5782377a46332

Update from stable branch.

crypto/bio/bss_sock.c

diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c
index 472dd75..30c3cea 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 @@
 		}
 	return(0);
 	}
+
+#endif  /* #ifndef OPENSSL_NO_SOCK */

util/pl/VC-32.pl

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index a20e735..d16ec78 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -162,7 +162,7 @@
 	}
 
 # static library stuff
-$mklib='lib';
+$mklib='lib /nologo';
 $ranlib='';
 $plib="";
 $libp=".lib";
@@ -193,7 +193,7 @@
 	$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";