[mapguide-commits] r7819 - in sandbox/jng/webtier_upgrade_v2/MgDev/Oem/SWIGEx: Lib/php5 Source/Modules Win32

[svn_mapguide at osgeo.org]

Author: jng
Date: 2013-08-30 01:31:51 -0700 (Fri, 30 Aug 2013)
New Revision: 7819

Modified:
   sandbox/jng/webtier_upgrade_v2/MgDev/Oem/SWIGEx/Lib/php5/php5run.swg
   sandbox/jng/webtier_upgrade_v2/MgDev/Oem/SWIGEx/Source/Modules/php5.cxx
   sandbox/jng/webtier_upgrade_v2/MgDev/Oem/SWIGEx/Win32/Swig.exe
Log:
SWIG update for PHP 5.5
 - function_entry is now zend_function_entry
 - zend_rsrc_list_get_rsrc_type returns const char* instead of char*

Modified: sandbox/jng/webtier_upgrade_v2/MgDev/Oem/SWIGEx/Lib/php5/php5run.swg
===================================================================
--- sandbox/jng/webtier_upgrade_v2/MgDev/Oem/SWIGEx/Lib/php5/php5run.swg	2013-08-30 07:01:13 UTC (rev 7818)
+++ sandbox/jng/webtier_upgrade_v2/MgDev/Oem/SWIGEx/Lib/php5/php5run.swg	2013-08-30 08:31:51 UTC (rev 7819)
@@ -196,13 +196,12 @@
   swig_object_wrapper *value;
   void *p;
   int type;
-  char *type_name;
 
   value = (swig_object_wrapper *) zend_list_find(z->value.lval,&type);
   p = value->ptr;
   if (type==-1) return -1;
 
-  type_name=zend_rsrc_list_get_rsrc_type(z->value.lval TSRMLS_CC);
+  const char* type_name=zend_rsrc_list_get_rsrc_type(z->value.lval TSRMLS_CC);
 
   return SWIG_ZTS_ConvertResourceData(p,type,type_name,ptr,ty TSRMLS_CC);
 }

Modified: sandbox/jng/webtier_upgrade_v2/MgDev/Oem/SWIGEx/Source/Modules/php5.cxx
===================================================================
--- sandbox/jng/webtier_upgrade_v2/MgDev/Oem/SWIGEx/Source/Modules/php5.cxx	2013-08-30 07:01:13 UTC (rev 7818)
+++ sandbox/jng/webtier_upgrade_v2/MgDev/Oem/SWIGEx/Source/Modules/php5.cxx	2013-08-30 08:31:51 UTC (rev 7819)
@@ -873,7 +873,8 @@
     cs_entry = NULL;
     
     Printf(s_entry,"/* Every non-class user visible function must have an entry here */\n");
-    Printf(s_entry,"function_entry %s_functions[] = {\n", module);
+    //PHP 5.4+ changed this to zend_function_entry
+    Printf(s_entry,"zend_function_entry %s_functions[] = {\n", module);
     
     /* start the init section */
     if (gen_extra)

Modified: sandbox/jng/webtier_upgrade_v2/MgDev/Oem/SWIGEx/Win32/Swig.exe
===================================================================
(Binary files differ)