Update from stable branch.
This commit is contained in:
parent
4df100935f
commit
c836f8ef73
2 changed files with 7 additions and 2 deletions
|
@ -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 */
|
||||
|
|
|
@ -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";
|
||||
|
|
Loading…
Reference in a new issue