From: Anatol Belski <ab@php.net>
Date: Thu, 20 Oct 2016 09:38:59 +0000 (+0200)
Subject: fix Windows compilation
X-Git-Tag: php-7.2.0alpha1~1066
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab52afb932154548524ebba54c7052b20edb7b55;p=php

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 966c4dbacb..961b4ca873 100644
--- 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 aa539efca5..070680d4a7 100644
--- 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 31de712e96..63cc52d6b7 100644
--- 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 6c2df29f81..64a9a6eaa5 100644
--- 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 7ac46f044c..309f0dce3d 100644
--- 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 06ba150600..7a7d9c833c 100644
--- 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 9ebfdaf0cc..c554e73dc4 100644
--- 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
index 3e45052b0d..0000000000
--- 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