Changeset 1297 for trunk


Ignore:
Timestamp:
2013-07-12T06:30:00+02:00 (9 months ago)
Author:
moo
Message:

fix PHP 5.0 build

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/mod_cacher/xc_cacher.c

    r1281 r1297  
    996996        wrapper = php_stream_locate_url_wrapper(filepath, &path_for_open, 0 TSRMLS_CC);  
    997997        if (wrapper && wrapper->wops->url_stat 
    998          && wrapper != &php_plain_files_wrapper 
    999998         && wrapper->wops->url_stat(wrapper, path_for_open, PHP_STREAM_URL_STAT_QUIET, &ssb, NULL TSRMLS_CC) == SUCCESS) { 
    1000999            *statbuf = ssb.sb; 
  • trunk/processor/processor.m4

    r1287 r1297  
    212212#ifdef ZEND_ENGINE_2_4 
    213213    PROCESS(zend_uchar, type_hint) 
    214 #else 
     214#elif defined(ZEND_ENGINE_2_1) 
    215215    PROCESS(zend_bool, array_type_hint) 
    216216#endif 
     
    407407    PROCESS(zend_uint, line_start) 
    408408    PROCESS(zend_uint, line_end) 
    409 #       ifdef ZEND_ENGINE_2_1 
    410409    PROCESS(zend_uint, doc_comment_len) 
    411410    PROC_ZSTRING_L(, doc_comment, doc_comment_len) 
    412 #       endif 
    413411#   endif 
    414412 
    415413    /* # NOT DONE */ 
     414#   ifdef ZEND_ENGINE_2_1 
    416415    COPY(serialize_func) 
    417416    COPY(unserialize_func) 
     417#   endif 
    418418    COPY(iterator_funcs) 
    419419    COPY(create_object) 
     
    423423    COPY(get_static_method) 
    424424#   endif 
     425#   ifdef ZEND_ENGINE_2_1 
    425426    COPY(serialize) 
    426427    COPY(unserialize) 
     428#   endif 
    427429    /* deal with it inside xc_fix_method */ 
    428430    SETNULL(constructor) 
     
    586588    PROCESS(ulong, extended_value) 
    587589    PROCESS(uint, lineno) 
    588 #ifdef ZEND_ENGINE_2_1 
    589590#ifdef ZEND_ENGINE_2_4 
    590591    PROCESS(zend_uchar, op1_type) 
     
    639640    ') 
    640641    PROCESS(opcode_handler_t, handler) 
    641 #endif 
    642642') 
    643643dnl }}} 
Note: See TracChangeset for help on using the changeset viewer.