Index: php_mapscript.c
===================================================================
RCS file: /data2/cvsroot/mapserver/mapscript/php3/php_mapscript.c,v
retrieving revision 1.206
diff -u -r1.206 php_mapscript.c
--- php_mapscript.c	14 Jul 2004 16:07:11 -0000	1.206
+++ php_mapscript.c	22 Jul 2004 11:44:20 -0000
@@ -715,10 +715,21 @@
 static zend_class_entry *labelcache_class_entry_ptr;
 static zend_class_entry *symbol_class_entry_ptr;
 
+#ifdef ZEND_ENGINE_2
+ZEND_BEGIN_ARG_INFO(one_arg_force_ref, 0)
+    ZEND_ARG_PASS_INFO(1)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(two_args_first_arg_force_ref, 0)
+    ZEND_ARG_PASS_INFO(1)
+    ZEND_ARG_PASS_INFO(0)
+ZEND_END_ARG_INFO()
+#else
 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},
@@ -1816,7 +1827,7 @@
     _phpms_set_property_double(pThis,"cellsize", self->cellsize, E_ERROR); 
     _phpms_set_property_double(pThis,"scale", self->scale, E_ERROR); 
 
-    if (zend_hash_find(pThis->value.obj.properties, "extent", sizeof("extent"),
+    if (zend_hash_find(Z_OBJPROP_P(pThis), "extent", sizeof("extent"),
                        (void **)&pExtent) == SUCCESS)
     {
         _phpms_set_property_double((*pExtent),"minx", self->extent.minx, 
@@ -1946,7 +1957,7 @@
             _phpms_set_property_double(pThis,"scale", self->scale, E_ERROR); 
             _phpms_set_property_long(pThis,"units", self->units, E_ERROR); 
 
-            if (zend_hash_find(pThis->value.obj.properties, "extent", 
+            if (zend_hash_find(Z_OBJPROP_P(pThis), "extent", 
                                sizeof("extent"),  (void **)&pExtent) == SUCCESS)
             {
                 _phpms_set_property_double((*pExtent),"minx", self->extent.minx, 
@@ -2465,7 +2476,7 @@
     _phpms_set_property_double(pThis,"scale", self->scale, E_ERROR); 
 
 #ifdef PHP4
-    if (zend_hash_find(pThis->value.obj.properties, "extent", sizeof("extent"), 
+    if (zend_hash_find(Z_OBJPROP_P(pThis), "extent", sizeof("extent"), 
                        (void **)&pExtent) == SUCCESS)
     {
         _phpms_set_property_double((*pExtent),"minx", self->extent.minx, 
@@ -2762,7 +2773,7 @@
     _phpms_set_property_double(pThis,"scale", self->scale, E_ERROR); 
 
 #ifdef PHP4
-    if (zend_hash_find(pThis->value.obj.properties, "extent", sizeof("extent"), 
+    if (zend_hash_find(Z_OBJPROP_P(pThis), "extent", sizeof("extent"), 
                         (void **)&pExtent) == SUCCESS)
     {
         _phpms_set_property_double((*pExtent),"minx", self->extent.minx, 
@@ -3104,7 +3115,7 @@
     _phpms_set_property_double(pThis,"scale", self->scale, E_ERROR); 
 
 #ifdef PHP4
-    if (zend_hash_find(pThis->value.obj.properties, "extent", sizeof("extent"), 
+    if (zend_hash_find(Z_OBJPROP_P(pThis), "extent", sizeof("extent"), 
                        (void **)&pExtent) == SUCCESS)
     {
         _phpms_set_property_double((*pExtent),"minx", self->extent.minx, 
@@ -3361,7 +3372,7 @@
          _phpms_set_property_double(pThis,"scale", self->scale, E_ERROR); 
 
 #ifdef PHP4
-         if (zend_hash_find(pThis->value.obj.properties, "extent", 
+         if (zend_hash_find(Z_OBJPROP_P(pThis), "extent", 
                             sizeof("extent"), (void **)&pExtent) == SUCCESS)
          {
              _phpms_set_property_double((*pExtent),"minx", 
@@ -3450,7 +3461,7 @@
          _phpms_set_property_double(pThis,"scale", self->scale, E_ERROR); 
 
 #ifdef PHP4
-         if (zend_hash_find(pThis->value.obj.properties, "extent", 
+         if (zend_hash_find(Z_OBJPROP_P(pThis), "extent", 
                             sizeof("extent"), (void **)&pExtent) == SUCCESS)
          {
              _phpms_set_property_double((*pExtent),"minx", 
@@ -5604,7 +5615,7 @@
     _phpms_set_property_long(pThis,"imagequality", self->imagequality, E_ERROR);
 
 #ifdef PHP4
-    if (zend_hash_find(pThis->value.obj.properties, "extent", sizeof("extent"), 
+    if (zend_hash_find(Z_OBJPROP_P(pThis), "extent", sizeof("extent"), 
                        (void **)&pExtent) == SUCCESS)
     {
         _phpms_set_property_double((*pExtent),"minx", self->extent.minx, 
@@ -5681,7 +5692,7 @@
         if(self->imagetype)
           _phpms_set_property_string(pThis,"imagetype", self->imagetype,E_ERROR);
         
-        if (zend_hash_find(pThis->value.obj.properties, "outputformat", 
+        if (zend_hash_find(Z_OBJPROP_P(pThis), "outputformat", 
                            sizeof("outputformat"), 
                            (void **)&pOutputformat) == SUCCESS)
         {
@@ -6256,7 +6267,7 @@
          */
 #ifdef PHP4
         pval **phandle;
-        if (zend_hash_find(pThis->value.obj.properties, "_handle_", 
+        if (zend_hash_find(Z_OBJPROP_P(pThis), "_handle_", 
                            sizeof("_handle_"), 
                            (void **)&phandle) == SUCCESS)
         {
@@ -9365,7 +9376,7 @@
          */
 #ifdef PHP4
         pval **phandle;
-        if (zend_hash_find(pThis->value.obj.properties, "_handle_", 
+        if (zend_hash_find(Z_OBJPROP_P(pThis), "_handle_", 
                            sizeof("_handle_"), 
                            (void **)&phandle) == SUCCESS)
         {
@@ -9712,7 +9723,7 @@
          */
 #ifdef PHP4
         pval **phandle;
-        if (zend_hash_find(pThis->value.obj.properties, "_handle_", 
+        if (zend_hash_find(Z_OBJPROP_P(pThis), "_handle_", 
                            sizeof("_handle_"), 
                            (void **)&phandle) == SUCCESS)
         {
@@ -9964,7 +9975,7 @@
     else
     {
 #ifdef PHP4
-         if (zend_hash_find(pThis->value.obj.properties, "bounds", 
+         if (zend_hash_find(Z_OBJPROP_P(pThis), "bounds", 
                             sizeof("bounds"), (void **)&pBounds) == SUCCESS)
          {
              _phpms_set_property_double((*pBounds),"minx", self->bounds.minx, 
@@ -10426,7 +10437,7 @@
          */
 #ifdef PHP4
         pval **phandle;
-        if (zend_hash_find(pThis->value.obj.properties, "_handle_", 
+        if (zend_hash_find(Z_OBJPROP_P(pThis), "_handle_", 
                            sizeof("_handle_"), 
                            (void **)&phandle) == SUCCESS)
         {
@@ -10951,7 +10962,7 @@
          */
 #ifdef PHP4
         pval **phandle;
-        if (zend_hash_find(pThis->value.obj.properties, "_handle_", 
+        if (zend_hash_find(Z_OBJPROP_P(pThis), "_handle_", 
                            sizeof("_handle_"), 
                            (void **)&phandle) == SUCCESS)
         {
@@ -11549,7 +11560,7 @@
          */
 #ifdef PHP4
         pval **phandle;
-        if (zend_hash_find(pThis->value.obj.properties, "_handle_", 
+        if (zend_hash_find(Z_OBJPROP_P(pThis), "_handle_", 
                            sizeof("_handle_"), 
                            (void **)&phandle) == SUCCESS)
         {
@@ -11698,7 +11709,7 @@
          */
 #ifdef PHP4
         pval **phandle;
-        if (zend_hash_find(pThis->value.obj.properties, "_handle_", 
+        if (zend_hash_find(Z_OBJPROP_P(pThis), "_handle_", 
                            sizeof("_handle_"), 
                            (void **)&phandle) == SUCCESS)
         {
Index: php_mapscript_util.c
===================================================================
RCS file: /data2/cvsroot/mapserver/mapscript/php3/php_mapscript_util.c,v
retrieving revision 1.19
diff -u -r1.19 php_mapscript_util.c
--- php_mapscript_util.c	9 Mar 2004 04:04:44 -0000	1.19
+++ php_mapscript_util.c	22 Jul 2004 11:44:20 -0000
@@ -145,7 +145,7 @@
         php3_error(E_ERROR, "Object expected as argument.");
         retVal = NULL;
     }
-    else if (zend_hash_find(pObj->value.obj.properties, "_handle_", 
+    else if (zend_hash_find(Z_OBJPROP_P(pObj), "_handle_", 
                             sizeof("_handle_"), 
                             (void **)&phandle) == FAILURE)
     {
@@ -197,7 +197,7 @@
         php3_error(err_type, "Object expected as argument.");
         return NULL;
     }
-    else if (zend_hash_find(pObj->value.obj.properties, property_name, 
+    else if (zend_hash_find(Z_OBJPROP_P(pObj), property_name, 
                             strlen(property_name)+1, 
                             (void **)&phandle) == FAILURE)
     {
@@ -244,7 +244,7 @@
         php3_error(err_type, "Object expected as argument.");
         return "";
     }
-    else if (zend_hash_find(pObj->value.obj.properties, 
+    else if (zend_hash_find(Z_OBJPROP_P(pObj), 
                             property_name, strlen(property_name)+1, 
                             (void **)&phandle) == FAILURE)
     {
@@ -270,7 +270,7 @@
         php3_error(err_type, "Object expected as argument.");
         return 0;
     }
-    else if (zend_hash_find(pObj->value.obj.properties, property_name, 
+    else if (zend_hash_find(Z_OBJPROP_P(pObj), property_name, 
                             strlen(property_name)+1, 
                             (void **)&phandle) == FAILURE)
     {
@@ -303,7 +303,7 @@
         php3_error(err_type, "Object expected as argument.");
         return 0.0;
     }
-    else if (zend_hash_find(pObj->value.obj.properties, property_name, 
+    else if (zend_hash_find(Z_OBJPROP_P(pObj), property_name, 
                             strlen(property_name)+1, 
                             (void **)&phandle) == FAILURE)
    {
@@ -329,7 +329,7 @@
         php3_error(err_type, "Object expected as argument.");
         return 0;
     }
-    else if (zend_hash_find(pObj->value.obj.properties, property_name, 
+    else if (zend_hash_find(Z_OBJPROP_P(pObj), property_name, 
                             strlen(property_name)+1, 
                             (void **)&phandle) == FAILURE)
     {
@@ -365,7 +365,7 @@
         php3_error(err_type, "Object expected as argument.");
         return -1;
     }
-    else if (zend_hash_find(pObj->value.obj.properties, property_name, 
+    else if (zend_hash_find(Z_OBJPROP_P(pObj), property_name, 
                             strlen(property_name)+1, 
                             (void **)&phandle) == FAILURE)
     {
@@ -393,7 +393,7 @@
         php3_error(err_type, "Object expected as argument.");
         return -1;
     }
-    else if (zend_hash_find(pObj->value.obj.properties, property_name, 
+    else if (zend_hash_find(Z_OBJPROP_P(pObj), property_name, 
                             strlen(property_name)+1, 
                             (void **)&phandle) == FAILURE)
     {
@@ -422,7 +422,7 @@
         php3_error(err_type, "Object expected as argument.");
         return -1;
     }
-    else if (zend_hash_find(pObj->value.obj.properties, property_name, 
+    else if (zend_hash_find(Z_OBJPROP_P(pObj), property_name, 
                             strlen(property_name)+1, 
                             (void **)&phandle) == FAILURE)
     {
@@ -451,7 +451,7 @@
         php3_error(err_type, "Object expected as argument.");
         return -1;
     }
-    else if (zend_hash_find(pObj->value.obj.properties, property_name, 
+    else if (zend_hash_find(Z_OBJPROP_P(pObj), property_name, 
                             strlen(property_name)+1, 
                             (void **)&phandle) == FAILURE)
     {