[mapserver-commits] r9728 - trunk/mapserver/mapscript/php3

svn at osgeo.org svn at osgeo.org
Thu Jan 21 18:30:13 EST 2010


Author: dmorissette
Date: 2010-01-21 18:30:12 -0500 (Thu, 21 Jan 2010)
New Revision: 9728

Modified:
   trunk/mapserver/mapscript/php3/php_mapscript.c
Log:
Re-add PHP4-specific code removed by accident in r9699 for (#2170)

Modified: trunk/mapserver/mapscript/php3/php_mapscript.c
===================================================================
--- trunk/mapserver/mapscript/php3/php_mapscript.c	2010-01-21 19:23:09 UTC (rev 9727)
+++ trunk/mapserver/mapscript/php3/php_mapscript.c	2010-01-21 23:30:12 UTC (rev 9728)
@@ -592,7 +592,7 @@
 static zend_class_entry *cgirequest_class_entry_ptr;
 static zend_class_entry *hashtable_class_entry_ptr;
 
-// ZEND_ENGINE_2: PHP5
+#ifdef ZEND_ENGINE_2  // PHP5
 ZEND_BEGIN_ARG_INFO(one_arg_force_ref, 0)
     ZEND_ARG_PASS_INFO(1)
 ZEND_END_ARG_INFO()
@@ -601,6 +601,12 @@
     ZEND_ARG_PASS_INFO(1)
     ZEND_ARG_PASS_INFO(0)
 ZEND_END_ARG_INFO()
+#else   // PHP4
+static unsigned char one_arg_force_ref[] = 
+  { 1, BYREF_FORCE};
+static unsigned char two_args_first_arg_force_ref[] = 
+    { 2, BYREF_FORCE, BYREF_NONE };
+#endif
 
 function_entry phpms_functions[] = {
     {"ms_getversion",   php3_ms_getversion,     NULL},



More information about the mapserver-commits mailing list