Changeset 481

Show
Ignore:
Timestamp:
10/01/2007 11:35:06 AM (12 months ago)
Author:
moo
Message:

merged [480] from trunk: compile against PHP_5_3

Location:
branches/1.2
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • branches/1.2

    • Property svnmerge-integrated changed from /trunk:1-302,344-346,371,374-375,388,391,393,395,398,400,402-405,407,410,416,421,434-435,438,444,456,458,478 to /trunk:1-302,344-346,371,374-375,388,391,393,395,398,400,402-405,407,410,416,421,434-435,438,444,456,458,478,480

  • branches/1.2/processor/head.m4

    r394 r481  
    256256#endif 
    257257        SET_IF_SAME_NAME(__call); 
     258#ifdef ZEND_CALLSTATIC_FUNC_NAME 
     259        SET_IF_SAME_NAME(__callstatic); 
     260#endif 
    258261#if defined(ZEND_ENGINE_2_2) || PHP_MAJOR_VERSION >= 6 
    259262        SET_IF_SAME_NAME(__tostring); 

  • branches/1.2/processor/processor.m4

    r394 r481  
    365365    COPY(get_iterator) 
    366366    COPY(interface_gets_implemented) 
     367#ifdef ZEND_ENGINE_2_3 
     368    COPY(get_static_method) 
     369#endif 
    367370    COPY(serialize) 
    368371    COPY(unserialize) 
    … …  
    382385#endif 
    383386    COPY(__call) 
     387#ifdef ZEND_CALLSTATIC_FUNC_NAME 
     388    COPY(__callstatic) 
     389#endif 
    384390    /* # NOT DONE */ 
    385391    COPY(module) 

  • branches/1.2/xcache.h

    r457 r481  
    2525#if !defined(ZEND_ENGINE_2_2) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 2 || PHP_MAJOR_VERSION > 5) 
    2626#   define ZEND_ENGINE_2_2 
     27#endif 
     28#if !defined(ZEND_ENGINE_2_3) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3 || PHP_MAJOR_VERSION > 5) 
     29#   define ZEND_ENGINE_2_3 
    2730#endif 
    2831