Changeset 178

Show
Ignore:
Timestamp:
09/18/2006 12:27:17 AM (2 years ago)
Author:
moo
Message:

Processor: fix type processor_t conflict with Mac OS X

Location:
trunk/processor
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/processor/head.m4

    r148 r178  
    5454#define MAX_DUP_STR_LEN 256 
    5555dnl }}} 
    56 /* export: typedef struct _processor_t processor_t; :export {{{ */ 
    57 struct _processor_t { 
     56/* export: typedef struct _xc_processor_t xc_processor_t; :export {{{ */ 
     57struct _xc_processor_t { 
    5858    char *p; 
    5959    zend_uint size; 
    … …  
    117117/* {{{ xc_calc_string_n */ 
    118118REDEF(`KIND', `calc') 
    119 static inline void xc_calc_string_n(processor_t *processor, zend_uchar type, zstr str, long size IFASSERT(`, int relayline')) { 
     119static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type, zstr str, long size IFASSERT(`, int relayline')) { 
    120120    pushdef(`__LINE__', `relayline') 
    121121    int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size); 
    … …  
    139139/* {{{ xc_store_string_n */ 
    140140REDEF(`KIND', `store') 
    141 static inline zstr xc_store_string_n(processor_t *processor, zend_uchar type, zstr str, long size IFASSERT(`, int relayline')) { 
     141static inline zstr xc_store_string_n(xc_processor_t *processor, zend_uchar type, zstr str, long size IFASSERT(`, int relayline')) { 
    142142    pushdef(`__LINE__', `relayline') 
    143143    int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size); 
    … …  
    166166 * return class_index + 1 
    167167 */ 
    168 static zend_ulong xc_get_class_num(processor_t *processor, zend_class_entry *ce) { 
     168static zend_ulong xc_get_class_num(xc_processor_t *processor, zend_class_entry *ce) { 
    169169    zend_ulong i; 
    170170    const xc_entry_t *xce = processor->xce_src; 
    … …  
    188188/* {{{ xc_get_class */ 
    189189#ifdef ZEND_ENGINE_2 
    190 static zend_class_entry *xc_get_class(processor_t *processor, zend_ulong class_num) { 
     190static zend_class_entry *xc_get_class(xc_processor_t *processor, zend_ulong class_num) { 
    191191    /* must be parent or currrent class */ 
    192192    assert(class_num <= processor->active_class_num); 
    … …  
    197197#ifdef ZEND_ENGINE_2 
    198198/* fix method on store */ 
    199 static void xc_fix_method(processor_t *processor, zend_op_array *dst) /* {{{ */ 
     199static void xc_fix_method(xc_processor_t *processor, zend_op_array *dst) /* {{{ */ 
    200200{ 
    201201    zend_function *zf = (zend_function *) dst; 
    … …  
    251251xc_entry_t *xc_processor_store_xc_entry_t(xc_entry_t *src TSRMLS_DC) { 
    252252    xc_entry_t *dst; 
    253     processor_t processor; 
     253    xc_processor_t processor; 
    254254 
    255255    memset(&processor, 0, sizeof(processor)); 
    … …  
    324324/* export: xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src, zend_bool readonly_protection TSRMLS_DC); :export {{{ */ 
    325325xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src, zend_bool readonly_protection TSRMLS_DC) { 
    326     processor_t processor; 
     326    xc_processor_t processor; 
    327327 
    328328    memset(&processor, 0, sizeof(processor)); 
    … …  
    335335/* export: zval *xc_processor_restore_zval(zval *dst, const zval *src TSRMLS_DC); :export {{{ */ 
    336336zval *xc_processor_restore_zval(zval *dst, const zval *src TSRMLS_DC) { 
    337     processor_t processor; 
     337    xc_processor_t processor; 
    338338 
    339339    memset(&processor, 0, sizeof(processor)); 

  • trunk/processor/struct.m4

    r93 r178  
    99    FUNC_NAME`'( 
    1010        IFDPRINT( `const $1 * const src, int indent') 
    11         IFCALC(   `processor_t *processor, const $1 * const src') 
    12         IFSTORE(  `processor_t *processor, $1 *dst, const $1 * const src') 
    13         IFRESTORE(`processor_t *processor, $1 *dst, const $1 * const src') 
     11        IFCALC(   `xc_processor_t *processor, const $1 * const src') 
     12        IFSTORE(  `xc_processor_t *processor, $1 *dst, const $1 * const src') 
     13        IFRESTORE(`xc_processor_t *processor, $1 *dst, const $1 * const src') 
    1414        IFDASM(   `zval *dst, const $1 * const src') 
    1515        IFASM(    `$1 *dst, const $1 * const src')