fix Windows compilation

php.h is included, it contains all the stuff needed and conflicts
otherwise.

diff --git a/ext/xmlrpc/libxmlrpc/queue.c b/ext/xmlrpc/libxmlrpc/queue.c
index 966c4dbacbf05c106678f5e96d5d794ea8d35968..961b4ca873dc0fa346f0494e831abee77ceee548 100644 (file)
--- a/ext/xmlrpc/libxmlrpc/queue.c
+++ b/ext/xmlrpc/libxmlrpc/queue.c
@@ -97,9 +97,6 @@ static const char rcsid[] = "#(@) $Id$";
  *
  ****************************************************************/
 
-#ifdef _WIN32
-#include "xmlrpc_win32.h"
-#endif
 #include <stdlib.h>
 #include <php.h>
 #include "queue.h"
@@ -791,7 +788,7 @@ int Q_Sort(queue *q, int (*Comp)(const void *, const void *))
    /* Now allocate memory of array, array of pointers */
 
    queue_index = emalloc(q->size * sizeof(q->cursor->data));
-   if(index == NULL)
+   if(queue_index == NULL)
       return False_;
 
    queue_posn_index = emalloc(q->size * sizeof(q->cursor));

diff --git a/ext/xmlrpc/libxmlrpc/xml_element.c b/ext/xmlrpc/libxmlrpc/xml_element.c
index aa539efca5a90a0c3eb3f976ac246a7091bb085f..070680d4a780039d9de473a0762f4b132c352775 100644 (file)
--- a/ext/xmlrpc/libxmlrpc/xml_element.c
+++ b/ext/xmlrpc/libxmlrpc/xml_element.c
@@ -119,9 +119,6 @@ static const char rcsid[] = "#(@) $Id$";
  ******/
 
 #include "ext/xml/expat_compat.h"
-#ifdef _WIN32
-#include "xmlrpc_win32.h"
-#endif
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>

diff --git a/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c b/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c
index 31de712e9636b5b353b5bcab9da5fc3c34560c57..63cc52d6b7b48de5476f144140469bf70267b101 100644 (file)
--- a/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c
+++ b/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c
@@ -30,9 +30,6 @@
 
 */
 
-#ifdef _WIN32
-#include "xmlrpc_win32.h"
-#endif
 #include <string.h>
 #include <stdlib.h>
 #include "xml_to_dandarpc.h"

diff --git a/ext/xmlrpc/libxmlrpc/xml_to_soap.c b/ext/xmlrpc/libxmlrpc/xml_to_soap.c
index 6c2df29f81a939c2b407ec5cfb2c3e91e834c18b..64a9a6eaa56b248b479cfa3f2191aeff9d1dd9d7 100644 (file)
--- a/ext/xmlrpc/libxmlrpc/xml_to_soap.c
+++ b/ext/xmlrpc/libxmlrpc/xml_to_soap.c
@@ -23,9 +23,6 @@
 
 static const char rcsid[] = "#(@) $Id:";
 
-#ifdef _WIN32
-#include "xmlrpc_win32.h"
-#endif
 #include <string.h>
 #include <stdlib.h>
 #include "xml_to_soap.h"

diff --git a/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c b/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c
index 7ac46f044c641f444ecd23882dcc1e82e9d28422..309f0dce3d83b0a6b9081e9bea164e3290e7384d 100644 (file)
--- a/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c
+++ b/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c
@@ -35,9 +35,6 @@ static const char rcsid[] = "#(@) $Id$";
 
 #include "php.h"
 #include "main/snprintf.h"
-#ifdef _WIN32
-#include "xmlrpc_win32.h"
-#endif
 #include <string.h>
 #include <stdlib.h>
 #include "xml_to_xmlrpc.h"

diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc.c b/ext/xmlrpc/libxmlrpc/xmlrpc.c
index 06ba15060055acd8a3d01005fbad517643f4834a..7a7d9c833c7313aea237ee64c3813e9d407cea17 100644 (file)
--- a/ext/xmlrpc/libxmlrpc/xmlrpc.c
+++ b/ext/xmlrpc/libxmlrpc/xmlrpc.c
@@ -145,9 +145,6 @@ static const char rcsid[] = "#(@) $Id$";
 
 #include "ext/xml/expat_compat.h"
 #include "main/php_reentrancy.h"
-#ifdef _WIN32
-#include "xmlrpc_win32.h"
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.c b/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.c
index 9ebfdaf0cc60a99d135edbcd494c62e8a72fc3cd..c554e73dc414e18d56c9e890349ffdc82892359b 100644 (file)
--- a/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.c
+++ b/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.c
@@ -51,9 +51,6 @@
  *******/
 
 
-#ifdef _WIN32
-#include "xmlrpc_win32.h"
-#endif
 #include "queue.h"
 #include "xmlrpc.h"
 #include "xmlrpc_private.h"

diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc_win32.h b/ext/xmlrpc/libxmlrpc/xmlrpc_win32.h
deleted file mode 100644 (file)
index 3e45052..0000000
--- a/ext/xmlrpc/libxmlrpc/xmlrpc_win32.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _XMLRPC_WIN32_H
-#define _XMLRPC_WIN32_H
-/* just some things needed to compile win32 */
-#include <windows.h>
-#include <stdlib.h>
-#ifndef inline
-# define inline __inline
-#endif
-#if !defined(snprintf) && _MSC_VER < 1900
-# define snprintf _snprintf
-#endif
-#ifndef strcasecmp
-# define strcasecmp(s1, s2) stricmp(s1, s2)
-#endif
-
-#endif