Changeset 548 for trunk/xcache.c

Timestamp:

03/21/2008 02:36:17 PM (9 months ago)

Author:

moo

Message:

PHP_5_3 support: uses ZEND_COMPILE_IGNORE_INTERNAL_CLASSES and ZEND_COMPILE_DELAYED_BINDING stuffs for PHP_5_3 support finally

Files:

• trunk/xcache.c (modified) (5 diffs)

trunk/xcache.c

@@ -720 +720 @@
         new_cest_ptrs[i] =
 #endif
+#ifdef ZEND_COMPILE_DELAYED_BINDING
+        xc_install_class(xce->name.str.val, &ci->cest, -1,
+                UNISW(0, ci->type), ci->key, ci->key_size, ci->h TSRMLS_CC);
+#else
         xc_install_class(xce->name.str.val, &ci->cest, ci->oplineno,
                 UNISW(0, ci->type), ci->key, ci->key_size, ci->h TSRMLS_CC);
+#endif
     }
 
@@ -1043 +1048 @@
 }
 /* }}} */
+#ifndef ZEND_COMPILE_DELAYED_BINDING
 static void xc_cache_early_binding_class_cb(zend_op *opline, int oplineno, void *data TSRMLS_DC) /* {{{ */
 {
@@ -1070 +1076 @@
 }
 /* }}} */
+#endif
 static void xc_free_php(xc_entry_data_php_t *php TSRMLS_DC) /* {{{ */
 {
@@ -1238 +1245 @@
     php->compilererror_cnt = ((xc_sandbox_t *) XG(sandbox))->compilererror_cnt;
 #endif
+#ifndef ZEND_COMPILE_DELAYED_BINDING
     /* {{{ find inherited classes that should be early-binding */
     php->have_early_binding = 0;
@@ -1248 +1256 @@
     xc_redo_pass_two(php->op_array TSRMLS_CC);
     /* }}} */
+#endif
 
     return op_array;