Changeset 508 in svn
- Timestamp:
- 2008-01-05T09:17:02Z (11 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/const_string.c
r491 r508 70 70 #elif defined(ZEND_ENGINE_2) 71 71 # include "const_string_opcodes_php5.0.h" 72 #else 73 # include "const_string_opcodes_php4.x.h" 72 74 #endif 73 75 -
trunk/processor/processor.m4
r507 r508 509 509 /* deep */ 510 510 STRUCT_P(HashTable, static_variables, HashTable_zval_ptr) 511 #ifdef ZEND_ENGINE_2 511 512 STRUCT_ARRAY_I(num_args, zend_arg_info, arg_info) 512 513 xc_gc_add_op_array(dst TSRMLS_CC); 514 #endif 513 515 define(`SKIPASSERT_ONCE') 514 516 } -
trunk/utils.c
r506 r508 787 787 memcpy(&EG(included_files), &OG(included_files), sizeof(EG(included_files))); 788 788 789 #ifdef E_STRICT 789 790 if (sandbox->compilererrors) { 790 791 int i; … … 794 795 efree(sandbox->compilererrors); 795 796 } 797 #endif 796 798 if (sandbox->alloc) { 797 799 efree(sandbox); -
trunk/xcache.c
r506 r508 1482 1482 /* }}} */ 1483 1483 1484 #ifdef ZEND_ENGINE_2 1484 1485 /* {{{ xc_gc_op_array_t */ 1485 1486 typedef struct { … … 1493 1494 gc_op_array.num_args = op_array->num_args; 1494 1495 gc_op_array.arg_info = op_array->arg_info; 1496 #ifdef ZEND_ENGINE_2 1495 1497 zend_hash_next_index_insert(&XG(gc_op_arrays), (void *) &gc_op_array, sizeof(gc_op_array), NULL); 1498 #endif 1496 1499 } 1497 1500 /* }}} */ … … 1511 1514 } 1512 1515 /* }}} */ 1516 #endif 1513 1517 1514 1518 /* module helper function */ … … 1744 1748 } 1745 1749 1750 #ifdef ZEND_ENGINE_2 1746 1751 zend_hash_init(&XG(gc_op_arrays), 32, NULL, xc_gc_op_array, 0); 1752 #endif 1747 1753 1748 1754 #if PHP_API_VERSION <= 20041225 … … 1760 1766 { 1761 1767 xc_entry_unholds(TSRMLS_C); 1768 #ifdef ZEND_ENGINE_2 1762 1769 zend_hash_destroy(&XG(gc_op_arrays)); 1770 #endif 1763 1771 xc_gc_expires_php(TSRMLS_C); 1764 1772 xc_gc_expires_var(TSRMLS_C); -
trunk/xcache_globals.h
r498 r508 18 18 long var_ttl; 19 19 20 #ifdef ZEND_ENGINE_2 20 21 HashTable gc_op_arrays; 22 #endif 21 23 22 24 HashTable internal_function_table;
Note: See TracChangeset
for help on using the changeset viewer.