提交 c836f8ef 编写于 作者: D Dr. Stephen Henson

Update from stable branch.

上级 4df10093
...@@ -60,6 +60,9 @@ ...@@ -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) ...@@ -300,3 +303,5 @@ int BIO_sock_non_fatal_error(int err)
} }
return(0); return(0);
} }
#endif /* #ifndef OPENSSL_NO_SOCK */
...@@ -162,7 +162,7 @@ else ...@@ -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/) { ...@@ -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";
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册