Changeset 483 for branches/1.2

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

merged [482] from trunk: fixed #129, added idx_type for 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,480 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,482

  • branches/1.2/processor/processor.m4

    r481 r483  
    8484        DONE(type) 
    8585        DONE(is_ref) 
     86#ifdef ZEND_ENGINE_2_3 
     87        COPY(idx_type) 
     88#endif 
    8689    } while(0); 
    8790    return; 
    … …  
    148151        DISPATCH(zend_uchar, is_ref) 
    149152        DISPATCH(zend_ushort, refcount) 
     153#ifdef ZEND_ENGINE_2_3 
     154        DISPATCH(zend_uchar, idx_type) 
     155#endif 
    150156    ')dnl IFDASM 
    151157')