From: Edin Kadribasic <edink@php.net>
Date: Sun, 15 Jun 2003 23:34:46 +0000 (+0000)
Subject: Win32 build fixes for openssl
X-Git-Tag: RELEASE_1_0_2~217
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e2743023b54951d735ed4556c24ddca1831cf24;p=php

Win32 build fixes for openssl
---

diff --git a/ext/openssl/openssl.dsp b/ext/openssl/openssl.dsp
index 40f58a92df..c68b2db012 100644
--- a/ext/openssl/openssl.dsp
+++ b/ext/openssl/openssl.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_openssl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php4ts.lib ssleay32.lib libeay32.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_openssl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
 
 !ELSEIF  "$(CFG)" == "openssl - Win32 Debug_TS"
 
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_openssl.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php4ts_debug.lib ssleay32.lib libeay32.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_openssl.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
 
 !ENDIF 
 
@@ -94,6 +94,10 @@ LINK32=link.exe
 
 SOURCE=.\openssl.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\xp_ssl.c
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index b45a2276ea..3df83ce6ac 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -507,7 +507,7 @@ php_stream_ops php_openssl_socket_ops = {
 };
 
 
-PHPAPI php_stream *php_openssl_ssl_socket_factory(const char *proto, long protolen,
+php_stream *php_openssl_ssl_socket_factory(const char *proto, long protolen,
 		char *resourcename, long resourcenamelen,
 		const char *persistent_id, int options, int flags,
 		struct timeval *timeout,
diff --git a/main/php_network.h b/main/php_network.h
index a0d16d2b46..18bf939468 100644
--- a/main/php_network.h
+++ b/main/php_network.h
@@ -165,7 +165,7 @@ struct _php_netstream_data_t	{
 	size_t ownsize;
 };
 typedef struct _php_netstream_data_t php_netstream_data_t;
-extern php_stream_ops php_stream_socket_ops;
+PHPAPI extern php_stream_ops php_stream_socket_ops;
 extern php_stream_ops php_stream_generic_socket_ops;
 #define PHP_STREAM_IS_SOCKET	(&php_stream_socket_ops)
 
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
index 54d7b4160b..c87300b14e 100644
--- a/main/streams/xp_socket.c
+++ b/main/streams/xp_socket.c
@@ -32,7 +32,7 @@
 #endif
 
 php_stream_ops php_stream_generic_socket_ops;
-php_stream_ops php_stream_socket_ops;
+PHPAPI php_stream_ops php_stream_socket_ops;
 php_stream_ops php_stream_udp_socket_ops;
 #ifdef AF_UNIX
 php_stream_ops php_stream_unix_socket_ops;