Ignore:
Timestamp:
2012-04-05T15:37:21+02:00 (2 years ago)
Author:
moo
Message:

merge some changes from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/processor/processor.m4

    r739 r886  
    241241    DISPATCH(int, flags) 
    242242    DISPATCH(uint, name_len) 
    243     pushdef(`emalloc', `malloc($1)') 
    244     pushdef(`ecalloc', `calloc($1, $2)') 
     243    pushdef(`estrndup', `zend_strndup') 
    245244    PROC_ZSTRING_N(, name, name_len) 
    246     popdef(`ecalloc') 
    247     popdef(`emalloc') 
     245    popdef(`estrndup') 
    248246    DISPATCH(int, module_number) 
    249247') 
Note: See TracChangeset for help on using the changeset viewer.