com php-src: fix Windows compilation: ext/xmlrpc/libxmlrpc/queue.c ext/xmlrpc/libxmlrpc/xml_element.c ext/xmlrpc/libxmlrpc/x ml_to_dandarpc.c
ext/xmlrpc/libxmlrpc/xml_to_soap .c ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c ext/xmlrpc/ libxmlrpc/xmlrpc.c ext/xmlrpc/libxmlrpc/xmlrpc_introspect ion.c
ext/xmlrpc/libxmlrpc/xmlrpc_win32.h

Commit: ab52afb932154548524ebba54c7052b20edb7b55 Author: Anatol Belski <ab@php.net> Thu, 20 Oct 2016 11:38:59 +0200 Parents: f23e99dd07bfedf78a0d91c822ad3fdf0e00bb5b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ab52afb932154548524ebba54c7052b20edb7b55 Log: fix Windows compilation php.h is included, it contains all the stuff needed and conflicts otherwise. Changed paths: M ext/xmlrpc/libxmlrpc/queue.c M ext/xmlrpc/libxmlrpc/xml_element.c M ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c M ext/xmlrpc/libxmlrpc/xml_to_soap.c M ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c M ext/xmlrpc/libxmlrpc/xmlrpc.c M ext/xmlrpc/libxmlrpc/xmlrpc_introspection.c D ext/xmlrpc/libxmlrpc/xmlrpc_win32.h Diff: diff --git a/ext/xmlrpc/libxmlrpc/queue.c b/ext/xmlrpc/libxmlrpc/queue.c index 966c4db..961b4ca 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 aa539ef..070680d 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 31de712..63cc52d 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 6c2df29..64a9a6e 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 7ac46f0..309f0dc 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 06ba150..7a7d9c8 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 9ebfdaf..c554e73 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 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