Win32 build fixes for openssl

diff --git a/ext/openssl/openssl.dsp b/ext/openssl/openssl.dsp
index 40f58a92df95d6d57bb8c2fb90ccb99110dd41a1..c68b2db012b0d7319ae1c0dde6b91ce00e209a85 100644 (file)
--- a/ext/openssl/openssl.dsp
+++ b/ext/openssl/openssl.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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"\r
+# 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"\r
 \r
 !ELSEIF  "$(CFG)" == "openssl - Win32 Debug_TS"\r
 \r
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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"\r
+# 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"\r
 \r
 !ENDIF \r
 \r
@@ -94,6 +94,10 @@ LINK32=link.exe
 \r
 SOURCE=.\openssl.c\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\xp_ssl.c\r
+# End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r

diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index b45a2276eaf815914a34e34b362e2c9207070992..3df83ce6ac707d3b6ad3bc62a1b3d1f4fac7061b 100644 (file)
--- 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 a0d16d2b461e8bea517583a8108690b61d5ffff7..18bf9394687f30b4b6daed674fbb7db77d626043 100644 (file)
--- 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 54d7b4160b6e38d9a155ea084ed2c47d51703991..c87300b14edd785702c517bd5579eb96999b8284 100644 (file)
--- 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;