Commit c836f8ef authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from stable branch.

parent 4df10093

crypto/bio/bss_sock.c

+5 −0
Original line number Diff line number Diff line
@@ -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 */

util/pl/VC-32.pl

+2 −2
Original line number Diff line number Diff line
@@ -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";