cvs: php4 /ext/openssl openssl.dsp xp_ssl.c /main php_network.h /main/streams xp_socket.c

edink Sun Jun 15 19:34:46 2003 EDT Modified files: /php4/main php_network.h /php4/main/streams xp_socket.c /php4/ext/openssl xp_ssl.c openssl.dsp Log: Win32 build fixes for openssl Index: php4/main/php_network.h diff -u php4/main/php_network.h:1.44 php4/main/php_network.h:1.45 --- php4/main/php_network.h:1.44 Tue Jun 10 16:03:42 2003 +++ php4/main/php_network.h Sun Jun 15 19:34:45 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_network.h,v 1.44 2003/06/10 20:03:42 imajes Exp $ */ +/* $Id: php_network.h,v 1.45 2003/06/15 23:34:45 edink Exp $ */ #ifndef _PHP_NETWORK_H #define _PHP_NETWORK_H @@ -165,7 +165,7 @@ 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) Index: php4/main/streams/xp_socket.c diff -u php4/main/streams/xp_socket.c:1.12 php4/main/streams/xp_socket.c:1.13 --- php4/main/streams/xp_socket.c:1.12 Tue Jun 10 16:03:42 2003 +++ php4/main/streams/xp_socket.c Sun Jun 15 19:34:45 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xp_socket.c,v 1.12 2003/06/10 20:03:42 imajes Exp $ */ +/* $Id: xp_socket.c,v 1.13 2003/06/15 23:34:45 edink Exp $ */ #include "php.h" #include "ext/standard/file.h" @@ -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; Index: php4/ext/openssl/xp_ssl.c diff -u php4/ext/openssl/xp_ssl.c:1.7 php4/ext/openssl/xp_ssl.c:1.8 --- php4/ext/openssl/xp_ssl.c:1.7 Tue Jun 10 16:03:34 2003 +++ php4/ext/openssl/xp_ssl.c Sun Jun 15 19:34:46 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xp_ssl.c,v 1.7 2003/06/10 20:03:34 imajes Exp $ */ +/* $Id: xp_ssl.c,v 1.8 2003/06/15 23:34:46 edink Exp $ */ #include "php.h" #include "ext/standard/file.h" @@ -507,7 +507,7 @@ }; -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, Index: php4/ext/openssl/openssl.dsp diff -u php4/ext/openssl/openssl.dsp:1.2 php4/ext/openssl/openssl.dsp:1.3 --- php4/ext/openssl/openssl.dsp:1.2 Mon Nov 11 11:11:28 2002 +++ php4/ext/openssl/openssl.dsp Sun Jun 15 19:34:46 2003 @@ -53,7 +53,7 @@ # 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 @@ # 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 @@ -93,6 +93,10 @@ # Begin Source File SOURCE=.\openssl.c +# End Source File +# Begin Source File + +SOURCE=.\xp_ssl.c # End Source File # End Group # Begin Group "Header Files"