generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update from stable branch.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2009-03-09 12:30:10 +00:00
parent 4df100935f
commit c836f8ef73
2 changed files with 7 additions and 2 deletions
crypto/bio
bss_sock.c
util/pl
VC-32.pl

5
crypto/bio/bss_sock.c

@ -60,6 +60,9 @@
#include <errno.h> #include <errno.h>
#define USE_SOCKETS #define USE_SOCKETS
#include "cryptlib.h" #include "cryptlib.h"
#ifndef OPENSSL_NO_SOCK
#include <openssl/bio.h> #include <openssl/bio.h>
#ifdef WATT32 #ifdef WATT32
@ -300,3 +303,5 @@ int BIO_sock_non_fatal_error(int err)
} }
return(0); return(0);
} }
#endif /* #ifndef OPENSSL_NO_SOCK */

4
util/pl/VC-32.pl

@ -162,7 +162,7 @@ else
} }
# static library stuff # static library stuff
$mklib='lib'; $mklib='lib /nologo';
$ranlib=''; $ranlib='';
$plib=""; $plib="";
$libp=".lib"; $libp=".lib";
@ -193,7 +193,7 @@ if ($FLAVOR =~ /WIN64A/) {
$asmtype="win32n"; $asmtype="win32n";
$afile='-o '; $afile='-o ';
} else { } else {
$asm='ml /Cp /coff /c /Cx'; $asm='ml /nologo /Cp /coff /c /Cx';
$asm.=" /Zi" if $debug; $asm.=" /Zi" if $debug;
$afile='/Fo'; $afile='/Fo';
$asmtype="win32"; $asmtype="win32";