Changeset 508 in svn


Ignore:
Timestamp:
2008-01-05T10:17:02+01:00 (7 years ago)
Author:
Xuefer
Message:

PHP_4: fix build

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/const_string.c

    r491 r508  
    7070#elif defined(ZEND_ENGINE_2)
    7171#   include "const_string_opcodes_php5.0.h"
     72#else
     73#   include "const_string_opcodes_php4.x.h"
    7274#endif
    7375
  • trunk/processor/processor.m4

    r507 r508  
    509509        /* deep */
    510510        STRUCT_P(HashTable, static_variables, HashTable_zval_ptr)
     511#ifdef ZEND_ENGINE_2
    511512        STRUCT_ARRAY_I(num_args, zend_arg_info, arg_info)
    512513        xc_gc_add_op_array(dst TSRMLS_CC);
     514#endif
    513515        define(`SKIPASSERT_ONCE')
    514516    }
  • trunk/utils.c

    r506 r508  
    787787    memcpy(&EG(included_files), &OG(included_files), sizeof(EG(included_files)));
    788788
     789#ifdef E_STRICT
    789790    if (sandbox->compilererrors) {
    790791        int i;
     
    794795        efree(sandbox->compilererrors);
    795796    }
     797#endif
    796798    if (sandbox->alloc) {
    797799        efree(sandbox);
  • trunk/xcache.c

    r506 r508  
    14821482/* }}} */
    14831483
     1484#ifdef ZEND_ENGINE_2
    14841485/* {{{ xc_gc_op_array_t */
    14851486typedef struct {
     
    14931494    gc_op_array.num_args = op_array->num_args;
    14941495    gc_op_array.arg_info = op_array->arg_info;
     1496#ifdef ZEND_ENGINE_2
    14951497    zend_hash_next_index_insert(&XG(gc_op_arrays), (void *) &gc_op_array, sizeof(gc_op_array), NULL);
     1498#endif
    14961499}
    14971500/* }}} */
     
    15111514}
    15121515/* }}} */
     1516#endif
    15131517
    15141518/* module helper function */
     
    17441748    }
    17451749
     1750#ifdef ZEND_ENGINE_2
    17461751    zend_hash_init(&XG(gc_op_arrays), 32, NULL, xc_gc_op_array, 0);
     1752#endif
    17471753
    17481754#if PHP_API_VERSION <= 20041225
     
    17601766{
    17611767    xc_entry_unholds(TSRMLS_C);
     1768#ifdef ZEND_ENGINE_2
    17621769    zend_hash_destroy(&XG(gc_op_arrays));
     1770#endif
    17631771    xc_gc_expires_php(TSRMLS_C);
    17641772    xc_gc_expires_var(TSRMLS_C);
  • trunk/xcache_globals.h

    r498 r508  
    1818    long   var_ttl;
    1919
     20#ifdef ZEND_ENGINE_2
    2021    HashTable gc_op_arrays;
     22#endif
    2123
    2224    HashTable internal_function_table;
Note: See TracChangeset for help on using the changeset viewer.