Setting tag plcapi-5.3-11

[plcapi.git] / php / xmlrpc / xmlrpc-epi-php.c

diff --git a/php/xmlrpc/xmlrpc-epi-php.c b/php/xmlrpc/xmlrpc-epi-php.c
index 435092c..c2dc4e0 100644 (file)
--- 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  *
@@ -93,6 +91,31 @@
 #endif
 /* ==================== end patch */
 
+/* ====================
+ * Thierry - Jan. 30 2013 
+ * patch for php - issues first triggered on f18 with php-5.4
+ * https://bugs.php.net/bug.php?id=60016 
+ * https://bugs.php.net/bug.php?id=60016 
+ */
+#if ZEND_MODULE_API_NO >= 20100525
+// No more defined with PHP 5.4
+#define function_entry zend_function_entry
+#define pval zval
+#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)
@@ -1441,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: