From: Edin Kadribasic <edink@php.net>
Date: Mon, 28 Mar 2005 00:07:24 +0000 (+0000)
Subject: Reshufle includes to make it compile on windows
X-Git-Tag: php-5.0.1b1~670
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e923407cc5b46cc13be6b9ebff18afcfd86eaed7;p=php

Reshufle includes to make it compile on windows
---

diff --git a/ext/xmlrpc/libxmlrpc/xml_element.c b/ext/xmlrpc/libxmlrpc/xml_element.c
index e9f6a4bbb0..68eb0b60e3 100644
--- a/ext/xmlrpc/libxmlrpc/xml_element.c
+++ b/ext/xmlrpc/libxmlrpc/xml_element.c
@@ -44,6 +44,9 @@ static const char rcsid[] = "#(@) $Id$";
  *   06/2000
  * HISTORY
  *   $Log$
+ *   Revision 1.7  2005/03/26 03:13:58  sniper
+ *   - Made it possible to build ext/xmlrpc with libxml2
+ *
  *   Revision 1.6  2004/06/01 20:16:06  iliaa
  *   Fixed bug #28597 (xmlrpc_encode_request() incorrectly encodes chars in
  *   200-210 range).
@@ -101,6 +104,7 @@ static const char rcsid[] = "#(@) $Id$";
  *   there must be some.
  ******/
  
+#include "ext/xml/expat_compat.h"
 #ifdef _WIN32
 #include "xmlrpc_win32.h"
 #endif
@@ -110,7 +114,6 @@ static const char rcsid[] = "#(@) $Id$";
 
 #include "xml_element.h"
 #include "queue.h"
-#include "ext/xml/expat_compat.h"
 #include "encodings.h"
 
 #define my_free(thing)  if(thing) {free(thing); thing = 0;}
diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc.c b/ext/xmlrpc/libxmlrpc/xmlrpc.c
index 90a8b92109..4112216866 100644
--- a/ext/xmlrpc/libxmlrpc/xmlrpc.c
+++ b/ext/xmlrpc/libxmlrpc/xmlrpc.c
@@ -43,6 +43,9 @@ static const char rcsid[] = "#(@) $Id$";
  *   9/1999 - 10/2000
  * HISTORY
  *   $Log$
+ *   Revision 1.7  2005/03/26 03:13:58  sniper
+ *   - Made it possible to build ext/xmlrpc with libxml2
+ *
  *   Revision 1.6  2004/04/27 17:33:59  iliaa
  *   Removed C++ style comments.
  *
@@ -119,7 +122,7 @@ static const char rcsid[] = "#(@) $Id$";
  *     - comprehensive API for manipulation of values
  *******/
 
-
+#include "ext/xml/expat_compat.h"
 #ifdef _WIN32
 #include "xmlrpc_win32.h"
 #endif
@@ -132,7 +135,6 @@ static const char rcsid[] = "#(@) $Id$";
 
 #include "queue.h"
 #include "xmlrpc.h"
-#include "ext/xml/expat_compat.h"
 #include "base64.h"
 
 #include "xml_to_xmlrpc.h"