Update from stable branch.

diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c
index 472dd75821c5e65d4b3cfd93fe777a489a7d449b..30c3ceab468cf1ca50a9bb65e8f51dbda014d727 100644 (file)
--- 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 a20e73566b14a66f71129c36b7d3144546eaec25..d16ec7877ab3b614fdd85ca82f4d28756299038b 100644 (file)
--- 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";