Changeset 721 for trunk/xcache.c


Ignore:
Timestamp:
2011-04-09T13:05:07+02:00 (4 years ago)
Author:
moo
Message:

PHP_6: prepared in literal way for FILE DIR fix up

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/xcache.c

    r716 r721  
    11771177 
    11781178/* {{{ Constant Usage */ 
    1179 #define xcache_op1_is_file 1 
    1180 #define xcache_op1_is_dir  2 
    1181 #define xcache_op2_is_file 4 
    1182 #define xcache_op2_is_dir  8 
     1179#ifdef ZEND_ENGINE_2_4 
     1180#else 
     1181#   define xcache_op1_is_file 1 
     1182#   define xcache_op1_is_dir  2 
     1183#   define xcache_op2_is_file 4 
     1184#   define xcache_op2_is_dir  8 
     1185#endif 
    11831186typedef struct { 
    11841187    zend_bool filepath_used; 
     
    11901193static void xc_collect_op_array_info(xc_entry_t *xce, xc_entry_data_php_t *php, xc_const_usage_t *usage, xc_op_array_info_t *op_array_info, zend_op_array *op_array TSRMLS_DC) /* {{{ */ 
    11911194{ 
     1195#ifdef ZEND_ENGINE_2_4 
    11921196    int oplineno; 
     1197#else 
     1198    int oplineno; 
     1199#endif 
    11931200    xc_vector_t vector_int; 
    11941201 
    11951202    xc_vector_init(int, &vector_int); 
    11961203 
     1204#ifdef ZEND_ENGINE_2_4 
     1205#else 
    11971206#define XCACHE_CHECK_OP(type, op) \ 
    11981207    if (zend_binary_strcmp(Z_STRVAL(Z_OP_CONSTANT(opline->op)), Z_STRLEN(Z_OP_CONSTANT(opline->op)), xce->type##path, xce->type##path_len) == 0) { \ 
     
    12441253    op_array_info->oplineinfo_cnt = vector_int.cnt; 
    12451254    op_array_info->oplineinfos    = xc_vector_detach(int, &vector_int); 
     1255#endif 
    12461256    xc_vector_free(int, &vector_int); 
    12471257} 
     
    12491259void xc_fix_op_array_info(const xc_entry_t *xce, const xc_entry_data_php_t *php, zend_op_array *op_array, int copy, const xc_op_array_info_t *op_array_info TSRMLS_DC) /* {{{ */ 
    12501260{ 
     1261#ifdef ZEND_ENGINE_2_4 
     1262#else 
    12511263    int i; 
    1252     if (!op_array_info->oplineinfo_cnt) { 
    1253         return; 
    1254     } 
    1255  
     1264#endif 
     1265 
     1266#ifdef ZEND_ENGINE_2_4 
     1267#else 
    12561268    for (i = 0; i < op_array_info->oplineinfo_cnt; i += 2) { 
    12571269        int oplineno = op_array_info->oplineinfos[i]; 
     
    13401352        } 
    13411353    } 
     1354#endif 
    13421355} 
    13431356/* }}} */ 
    13441357static void xc_free_op_array_info(xc_op_array_info_t *op_array_info TSRMLS_DC) /* {{{ */ 
    13451358{ 
     1359#ifdef ZEND_ENGINE_2_4 
     1360    if (op_array_info->literalinfos) { 
     1361        efree(op_array_info->literalinfos); 
     1362    } 
     1363#else 
    13461364    if (op_array_info->oplineinfos) { 
    13471365        efree(op_array_info->oplineinfos); 
    13481366    } 
     1367#endif 
    13491368} 
    13501369/* }}} */ 
Note: See TracChangeset for help on using the changeset viewer.