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

merged [480] from trunk: compile against PHP_5_3

Location:
branches/1.2
Files:
2 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);