Changeset 508 in svn

Timestamp:

2008-01-05T09:17:02Z (10 years ago)

Author:

Xuefer

Message:

PHP_4: fix build

Location:

trunk

Files:

• const_string.c (modified) (1 diff)
• processor/processor.m4 (modified) (1 diff)
• utils.c (modified) (2 diffs)
• xcache.c (modified) (5 diffs)
• xcache_globals.h (modified) (1 diff)

trunk/const_string.c

@@ -70 +70 @@
 #elif defined(ZEND_ENGINE_2)
 #   include "const_string_opcodes_php5.0.h"
+#else
+#   include "const_string_opcodes_php4.x.h"
 #endif
 

trunk/processor/processor.m4

@@ -509 +509 @@
         /* deep */
         STRUCT_P(HashTable, static_variables, HashTable_zval_ptr)
+#ifdef ZEND_ENGINE_2
         STRUCT_ARRAY_I(num_args, zend_arg_info, arg_info)
         xc_gc_add_op_array(dst TSRMLS_CC);
+#endif
         define(`SKIPASSERT_ONCE')
     }

trunk/utils.c

@@ -787 +787 @@
     memcpy(&EG(included_files), &OG(included_files), sizeof(EG(included_files)));
 
+#ifdef E_STRICT
     if (sandbox->compilererrors) {
         int i;
@@ -794 +795 @@
         efree(sandbox->compilererrors);
     }
+#endif
     if (sandbox->alloc) {
         efree(sandbox);

trunk/xcache.c

@@ -1482 +1482 @@
 /* }}} */
 
+#ifdef ZEND_ENGINE_2
 /* {{{ xc_gc_op_array_t */
 typedef struct {
@@ -1493 +1494 @@
     gc_op_array.num_args = op_array->num_args;
     gc_op_array.arg_info = op_array->arg_info;
+#ifdef ZEND_ENGINE_2
     zend_hash_next_index_insert(&XG(gc_op_arrays), (void *) &gc_op_array, sizeof(gc_op_array), NULL);
+#endif
 }
 /* }}} */
@@ -1511 +1514 @@
 }
 /* }}} */
+#endif
 
 /* module helper function */
@@ -1744 +1748 @@
     }
 
+#ifdef ZEND_ENGINE_2
     zend_hash_init(&XG(gc_op_arrays), 32, NULL, xc_gc_op_array, 0);
+#endif
 
 #if PHP_API_VERSION <= 20041225
@@ -1760 +1766 @@
 {
     xc_entry_unholds(TSRMLS_C);
+#ifdef ZEND_ENGINE_2
     zend_hash_destroy(&XG(gc_op_arrays));
+#endif
     xc_gc_expires_php(TSRMLS_C);
     xc_gc_expires_var(TSRMLS_C);

trunk/xcache_globals.h

@@ -18 +18 @@
     long   var_ttl;
 
+#ifdef ZEND_ENGINE_2
     HashTable gc_op_arrays;
+#endif
 
     HashTable internal_function_table;