cvs: php4 /ext/xmlrpc php_xmlrpc.h xmlrpc-epi-php.c xmlrpc.dsp /ext/xmlrpc/libxmlrpc queue.c xml_element.c xml_to_dandarpc.c xml_to_soap.c
xml_to_xmlrpc.c xmlrpc.c xmlrpc_introspection.c xmlrpc_private.h xmlrpc_win32.h

shane Mon Dec 3 17:33:31 2001 EDT Added files: /php4/ext/xmlrpc xmlrpc.dsp /php4/ext/xmlrpc/libxmlrpc xmlrpc_win32.h Modified files: /php4/ext/xmlrpc php_xmlrpc.h xmlrpc-epi-php.c /php4/ext/xmlrpc/libxmlrpc queue.c xml_element.c xml_to_dandarpc.c xml_to_soap.c xml_to_xmlrpc.c xmlrpc.c xmlrpc_introspection.c xmlrpc_private.h Log: Make xmlrpc module compilable on windows. compiles, but untested.

Index: php4/ext/xmlrpc/php_xmlrpc.h diff -u php4/ext/xmlrpc/php_xmlrpc.h:1.2 php4/ext/xmlrpc/php_xmlrpc.h:1.3 --- php4/ext/xmlrpc/php_xmlrpc.h:1.2 Fri Oct 26 08:54:54 2001 +++ php4/ext/xmlrpc/php_xmlrpc.h Mon Dec 3 17:33:30 2001 @@ -93,6 +93,7 @@ for thread safety instead of using true globals. */ typedef struct { + int x; /* fix error in msvc, cannot have empty structs */ } zend_xmlrpc_globals; /* In every function that needs to use variables in zend_xmlrpc_globals, Index: php4/ext/xmlrpc/xmlrpc-epi-php.c diff -u php4/ext/xmlrpc/xmlrpc-epi-php.c:1.11 php4/ext/xmlrpc/xmlrpc-epi-php.c:1.12 --- php4/ext/xmlrpc/xmlrpc-epi-php.c:1.11 Mon Oct 29 21:33:11 2001 +++ php4/ext/xmlrpc/xmlrpc-epi-php.c Mon Dec 3 17:33:30 2001 @@ -64,7 +64,9 @@ #include "ext/standard/info.h" #include "php_ini.h" #include "php_xmlrpc.h" +#ifndef PHP_WIN32 #include "php_config.h" +#endif #include "xmlrpc.h" #define PHP_EXT_VERSION "0.50" @@ -317,6 +319,8 @@ if(id) return zend_hash_update(Z_ARRVAL_P(list), (char*)id, strlen(id)+1, (void *) val, sizeof(pval **), NULL); else return zend_hash_next_index_insert(Z_ARRVAL_P(list), (void *) val, sizeof(pval **), NULL); } + /* what is the correct return on error? */ + return 0; } #if ZEND_MODULE_API_NO >= 20001222 Index: php4/ext/xmlrpc/libxmlrpc/queue.c diff -u php4/ext/xmlrpc/libxmlrpc/queue.c:1.2 php4/ext/xmlrpc/libxmlrpc/queue.c:1.3 --- php4/ext/xmlrpc/libxmlrpc/queue.c:1.2 Mon Oct 29 21:33:11 2001 +++ php4/ext/xmlrpc/libxmlrpc/queue.c Mon Dec 3 17:33:31 2001 @@ -1,4 +1,4 @@ -static const char rcsid[] = "#(@) $Id: queue.c,v 1.2 2001/10/30 02:33:11 danda Exp $"; +static const char rcsid[] = "#(@) $Id: queue.c,v 1.3 2001/12/03 22:33:31 shane Exp $"; /* * Date last modified: Jan 2001 @@ -97,7 +97,9 @@ * ****************************************************************/ - +#ifdef _WIN32 +#include "xmlrpc_win32.h" +#endif #include <stdlib.h> #include "queue.h" Index: php4/ext/xmlrpc/libxmlrpc/xml_element.c diff -u php4/ext/xmlrpc/libxmlrpc/xml_element.c:1.1 php4/ext/xmlrpc/libxmlrpc/xml_element.c:1.2 --- php4/ext/xmlrpc/libxmlrpc/xml_element.c:1.1 Thu Sep 6 00:13:29 2001 +++ php4/ext/xmlrpc/libxmlrpc/xml_element.c Mon Dec 3 17:33:31 2001 @@ -31,7 +31,7 @@ */ -static const char rcsid[] = "#(@) $Id: xml_element.c,v 1.1 2001/09/06 04:13:29 danda Exp $"; +static const char rcsid[] = "#(@) $Id: xml_element.c,v 1.2 2001/12/03 22:33:31 shane Exp $"; @@ -71,7 +71,9 @@ * there must be some. ******/ - +#ifdef _WIN32 +#include "xmlrpc_win32.h" +#endif #include <stdlib.h> #include <string.h> Index: php4/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c diff -u php4/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c:1.2 php4/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c:1.3 --- php4/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c:1.2 Mon Oct 29 21:33:11 2001 +++ php4/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c Mon Dec 3 17:33:31 2001 @@ -30,6 +30,9 @@ */ +#ifdef _WIN32 +#include "xmlrpc_win32.h" +#endif #include <string.h> #include <stdlib.h> #include "xml_to_dandarpc.h" Index: php4/ext/xmlrpc/libxmlrpc/xml_to_soap.c diff -u php4/ext/xmlrpc/libxmlrpc/xml_to_soap.c:1.1 php4/ext/xmlrpc/libxmlrpc/xml_to_soap.c:1.2 --- php4/ext/xmlrpc/libxmlrpc/xml_to_soap.c:1.1 Mon Oct 29 21:33:11 2001 +++ php4/ext/xmlrpc/libxmlrpc/xml_to_soap.c Mon Dec 3 17:33:31 2001 @@ -23,6 +23,9 @@ static const char rcsid[] = "#(@) $Id:"; +#ifdef _WIN32 +#include "xmlrpc_win32.h" +#endif #include <string.h> #include <stdlib.h> #include "xml_to_soap.h" Index: php4/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c diff -u php4/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.2 php4/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.3 --- php4/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.2 Mon Oct 29 21:33:11 2001 +++ php4/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c Mon Dec 3 17:33:31 2001 @@ -31,8 +31,11 @@ */ -static const char rcsid[] = "#(@) $Id: xml_to_xmlrpc.c,v 1.2 2001/10/30 02:33:11 danda Exp $"; +static const char rcsid[] = "#(@) $Id: xml_to_xmlrpc.c,v 1.3 2001/12/03 22:33:31 shane Exp $"; +#ifdef _WIN32 +#include "xmlrpc_win32.h" +#endif #include <string.h> #include <stdlib.h> #include "xml_to_xmlrpc.h" Index: php4/ext/xmlrpc/libxmlrpc/xmlrpc.c diff -u php4/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.2 php4/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.3 --- php4/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.2 Mon Oct 29 21:33:11 2001 +++ php4/ext/xmlrpc/libxmlrpc/xmlrpc.c Mon Dec 3 17:33:31 2001 @@ -31,7 +31,7 @@ */ -static const char rcsid[] = "#(@) $Id: xmlrpc.c,v 1.2 2001/10/30 02:33:11 danda Exp $"; +static const char rcsid[] = "#(@) $Id: xmlrpc.c,v 1.3 2001/12/03 22:33:31 shane Exp $"; /****h* ABOUT/xmlrpc @@ -96,6 +96,9 @@ *******/ +#ifdef _WIN32 +#include "xmlrpc_win32.h" +#endif #include <stdio.h> #include <stdlib.h> #include <string.h> Index: php4/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.c diff -u php4/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.c:1.1 php4/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.c:1.2 --- php4/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.c:1.1 Thu Sep 6 00:13:29 2001 +++ php4/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.c Mon Dec 3 17:33:31 2001 @@ -41,6 +41,9 @@ *******/ +#ifdef _WIN32 +#include "xmlrpc_win32.h" +#endif #include "queue.h" #include "xmlrpc.h" #include "xmlrpc_private.h" Index: php4/ext/xmlrpc/libxmlrpc/xmlrpc_private.h diff -u php4/ext/xmlrpc/libxmlrpc/xmlrpc_private.h:1.2 php4/ext/xmlrpc/libxmlrpc/xmlrpc_private.h:1.3 --- php4/ext/xmlrpc/libxmlrpc/xmlrpc_private.h:1.2 Mon Oct 29 21:33:12 2001 +++ php4/ext/xmlrpc/libxmlrpc/xmlrpc_private.h Mon Dec 3 17:33:31 2001 @@ -160,7 +160,7 @@ /*---------------------------------------------------------------------------- * Functions */ -server_method* find_method(XMLRPC_SERVER server, const char* name); +extern server_method* find_method(XMLRPC_SERVER server, const char* name); const char* type_to_str(XMLRPC_VALUE_TYPE type, XMLRPC_VECTOR_TYPE vtype); /*---------------------------------------------------------------------------- Index: php4/ext/xmlrpc/xmlrpc.dsp +++ php4/ext/xmlrpc/xmlrpc.dsp # Microsoft Developer Studio Project File - Name="xmlrpc" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 CFG=xmlrpc - Win32 Debug_TS !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "xmlrpc.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "xmlrpc.mak" CFG="xmlrpc - Win32 Debug_TS" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "xmlrpc - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "xmlrpc - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "xmlrpc - Win32 Debug_TS" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "Debug_TS" # PROP BASE Intermediate_Dir "Debug_TS" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "Debug_TS" # PROP Intermediate_Dir "Debug_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLRPC_EXPORTS" /YX /FD /GZ /c # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /I "libxmlrpc" /I "..\xml\expat" /D HAVE_XMLRPC=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D ZEND_DEBUG=1 /D ZTS=1 /D COMPILE_DL_XMLRPC=1 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLRPC_EXPORTS" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x1009 /d "_DEBUG" # ADD RSC /l 0x1009 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 iconv.lib php4ts_debug.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_xmlrpc.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" !ELSEIF "$(CFG)" == "xmlrpc - Win32 Release_TS" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "Release_TS" # PROP BASE Intermediate_Dir "Release_TS" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "Release_TS" # PROP Intermediate_Dir "Release_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLRPC_EXPORTS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /I "libxmlrpc" /I "..\xml\expat" /D HAVE_XMLRPC=1 /D "ZEND_WIN32" /D ZEND_DEBUG=0 /D "PHP_WIN32" /D ZTS=1 /D COMPILE_DL_XMLRPC=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLRPC_EXPORTS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x1009 /d "NDEBUG" # ADD RSC /l 0x1009 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 iconv.lib php4ts.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_xmlrpc.dll" /libpath:"..\..\Release_TS" !ENDIF # Begin Target # Name "xmlrpc - Win32 Debug_TS" # Name "xmlrpc - Win32 Release_TS" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=".\xmlrpc-epi-php.c" # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File SOURCE=.\php_xmlrpc.h # End Source File # End Group # Begin Group "Resource Files" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # End Group # Begin Group "libxmlrpc" # PROP Default_Filter "" # Begin Source File SOURCE=.\libxmlrpc\base64.c # End Source File # Begin Source File SOURCE=.\libxmlrpc\base64.h # End Source File # Begin Source File SOURCE=.\libxmlrpc\encodings.c # End Source File # Begin Source File SOURCE=.\libxmlrpc\encodings.h # End Source File # Begin Source File SOURCE=.\libxmlrpc\queue.c # End Source File # Begin Source File SOURCE=.\libxmlrpc\queue.h # End Source File # Begin Source File SOURCE=.\libxmlrpc\simplestring.c # End Source File # Begin Source File SOURCE=.\libxmlrpc\simplestring.h # End Source File # Begin Source File SOURCE=.\libxmlrpc\system_methods.c # End Source File # Begin Source File SOURCE=.\libxmlrpc\system_methods_private.h # End Source File # Begin Source File SOURCE=.\libxmlrpc\xml_element.c # End Source File # Begin Source File SOURCE=.\libxmlrpc\xml_element.h # End Source File # Begin Source File SOURCE=.\libxmlrpc\xml_to_dandarpc.c # End Source File # Begin Source File SOURCE=.\libxmlrpc\xml_to_dandarpc.h # End Source File # Begin Source File SOURCE=.\libxmlrpc\xml_to_soap.c # End Source File # Begin Source File SOURCE=.\libxmlrpc\xml_to_soap.h # End Source File # Begin Source File SOURCE=.\libxmlrpc\xml_to_xmlrpc.c # End Source File # Begin Source File SOURCE=.\libxmlrpc\xml_to_xmlrpc.h # End Source File # Begin Source File SOURCE=.\libxmlrpc\xmlrpc.c # End Source File # Begin Source File SOURCE=.\libxmlrpc\xmlrpc.h # End Source File # Begin Source File SOURCE=.\libxmlrpc\xmlrpc_introspection.c # End Source File # Begin Source File SOURCE=.\libxmlrpc\xmlrpc_introspection.h # End Source File # Begin Source File SOURCE=.\libxmlrpc\xmlrpc_introspection_private.h # End Source File # Begin Source File SOURCE=.\libxmlrpc\xmlrpc_private.h # End Source File # End Group # End Target # End Project Index: php4/ext/xmlrpc/libxmlrpc/xmlrpc_win32.h +++ php4/ext/xmlrpc/libxmlrpc/xmlrpc_win32.h #ifndef _XMLRPC_WIN32_H #define _XMLRPC_WIN32_H /* just some things needed to compile win32 */ #include <windows.h> #include <stdlib.h> #define inline __inline #define snprintf _snprintf #define strcasecmp(s1, s2) stricmp(s1, s2) #endif