From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 2 Jan 2015 14:08:04 +0000 (+0100)
Subject: patch in our xmlrpc-php layer for fedora21
X-Git-Tag: plcapi-5.3-6~2
X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=b588b1f570e1193584eb024df6bbb471a87f3ccc

patch in our xmlrpc-php layer for fedora21
---

diff --git a/php/xmlrpc/xmlrpc-epi-php.c b/php/xmlrpc/xmlrpc-epi-php.c
index f690985..c2dc4e0 100644
--- a/php/xmlrpc/xmlrpc-epi-php.c
+++ b/php/xmlrpc/xmlrpc-epi-php.c
@@ -51,8 +51,6 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id$ */
-
 /**********************************************************************
 * BUGS:                                                               *
 *  - when calling a php user function, there appears to be no way to  *
@@ -106,6 +104,18 @@
 #endif
 /* ==================== end patch */
 
+/* ====================
+ * Thierry - Jan. 2 2015 
+ * patch for php - issues first triggered on f21 with php-5.6
+ * somebody somehow seems to have undefined 
+ * the IS_CONSTANT_ARRAY constant
+ * 
+ * however I'd rather not change the code that runs 
+ * on older releases, so see for the ugly ifdef below
+ * 
+/* ==================== end patch */
+
+
 /* ========== additional notes
  * in the process, I've also come across the following resources that might help 
  * if/when zend_get_parameters_ex gets deprecated (only generates warnings for now)
@@ -1454,7 +1464,10 @@ XMLRPC_VALUE_TYPE get_zval_xmlrpc_type(php_output_options* out, zval* value, zva
             type = xmlrpc_string;
             break;
          case IS_ARRAY:
+/* jan. 2 2015 - see note in file header */
+#ifdef IS_CONSTANT_ARRAY
          case IS_CONSTANT_ARRAY:
+#endif
             type = xmlrpc_vector;
             break;
          case IS_OBJECT: