Changeset 1313 in svn for trunk/processor/main.m4


Ignore:
Timestamp:
2013-07-15T02:30:59Z (2 years ago)
Author:
Xuefer
Message:

ZEND_STRS ZEND_STRL is inconsist between PHP5.0- and PHP5.0+

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/main.m4

    r1201 r1313  
    1818undefine(`len')
    1919')
    20 define(`ZEND_STRS', `($1), (sizeof($1))')
    21 define(`ZEND_STRL', `($1), (sizeof($1) - 1)')
     20define(`XCACHE_STRS', `($1), (sizeof($1))')
     21define(`XCACHE_STRL', `($1), (sizeof($1) - 1)')
    2222define(`DST', `dst->$1')
    2323define(`SRC', `src->$1')
     
    9595        IFRESTORE(`$1 = xc_get_class(processor, (zend_ulong) $2);')
    9696#ifdef IS_UNICODE
    97         IFDASM(`add_assoc_unicodel_ex(dst, ZEND_STRS("$3"), ZSTR_U($2->name), $2->name_length, 1);')
     97        IFDASM(`add_assoc_unicodel_ex(dst, XCACHE_STRS("$3"), ZSTR_U($2->name), $2->name_length, 1);')
    9898#else
    99         IFDASM(`add_assoc_stringl_ex(dst, ZEND_STRS("$3"), (char *) $2->name, $2->name_length, 1);')
     99        IFDASM(`add_assoc_stringl_ex(dst, XCACHE_STRS("$3"), (char *) $2->name, $2->name_length, 1);')
    100100#endif
    101101    }
     
    166166dnl {{{ COPYNULL_EX(1:dst, 2:elm-name)
    167167define(`COPYNULL_EX', `
    168     IFDASM(`add_assoc_null_ex(dst, ZEND_STRS("$2"));')
     168    IFDASM(`add_assoc_null_ex(dst, XCACHE_STRS("$2"));')
    169169    IFNOTMEMCPY(`IFCOPY(`$1 = NULL;')')
    170170    assert(patsubst($1, dst, src) == NULL);
     
    178178dnl {{{ COPYZERO_EX(1:dst, 2:elm-name)
    179179define(`COPYZERO_EX', `
    180     IFDASM(`add_assoc_long_ex(dst, ZEND_STRS("$2"), 0);')
     180    IFDASM(`add_assoc_long_ex(dst, XCACHE_STRS("$2"), 0);')
    181181    IFNOTMEMCPY(`IFCOPY(`$1 = 0;')')
    182182    assert(patsubst($1, dst, src) == 0);
Note: See TracChangeset for help on using the changeset viewer.