Ignore:
Timestamp:
2012-03-29T04:54:33+02:00 (3 years ago)
Author:
moo
Message:

kill warnings

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/main.m4

    r856 r860  
    2525define(`INDENT', `xc_dprint_indent(indent);') 
    2626dnl }}} 
    27 dnl {{{ ALLOC(1:dst, 2:type, 3:count=1, 4:clean=false, 5:forcetype=$2) 
     27dnl {{{ ALLOC(1:dst, 2:type, 3:count=1, 4:clean=false, 5:realtype=$2) 
    2828define(`ALLOC', ` 
    2929    pushdef(`COUNT', `ifelse(`$3', `', `1', `$3')') 
    3030    pushdef(`SIZE', `sizeof($2)ifelse(`$3', `', `', ` * $3')') 
    31     pushdef(`FORCETYPE', `ifelse(`$5', , `$2', `$5')') 
     31    pushdef(`REALTYPE', `ifelse(`$5', , `$2', `$5')') 
    3232    /* allocate */ 
    3333    IFCALC(` 
     
    5656            void *oldp = processor->p; 
    5757        ') 
    58         $1 = (FORCETYPE *) (processor->p = (char *) ALIGN(processor->p)); 
     58        $1 = (REALTYPE *) (processor->p = (char *) ALIGN(processor->p)); 
    5959        ifelse(`$4', `', ` 
    6060                IFASSERT(`memsetptr($1, (void *) (unsigned long) __LINE__, SIZE);') 
     
    7272    IFRESTORE(`ifelse(`$4', `', ` 
    7373            ifelse( 
    74                 FORCETYPE*COUNT, `zval*1', `ALLOC_ZVAL($1);', 
    75                 FORCETYPE*COUNT, `HashTable*1', `ALLOC_HASHTABLE($1);', 
    76                 `', `', `$1 = (FORCETYPE *) emalloc(SIZE);') 
     74                REALTYPE*COUNT, `zval*1', `ALLOC_ZVAL($1);', 
     75                REALTYPE*COUNT, `HashTable*1', `ALLOC_HASHTABLE($1);', 
     76                `', `', `$1 = (REALTYPE *) emalloc(SIZE);') 
    7777            IFASSERT(`memsetptr($1, (void *) __LINE__, SIZE);') 
    7878        ', ` 
    79             $1 = (FORCETYPE *) ecalloc(COUNT, sizeof($2)); 
    80         ') 
    81     ') 
     79            $1 = (REALTYPE *) ecalloc(COUNT, sizeof($2)); 
     80        ') 
     81    ') 
     82    popdef(`REALTYPE') 
    8283    popdef(`COUNT') 
    8384    popdef(`SIZE') 
    8485') 
    85 dnl CALLOC(1:dst, 2:type [, 3:count=1, 4:forcetype=$2 ]) 
     86dnl CALLOC(1:dst, 2:type [, 3:count=1, 4:realtype=$2 ]) 
    8687define(`CALLOC', `ALLOC(`$1', `$2', `$3', `1', `$4')') 
    8788dnl }}} 
     
    9697        IFDASM(`add_assoc_unicodel_ex(dst, ZEND_STRS("$3"), ZSTR_U($2->name), $2->name_length, 1);') 
    9798#else 
    98         IFDASM(`add_assoc_stringl_ex(dst, ZEND_STRS("$3"), $2->name, $2->name_length, 1);') 
     99        IFDASM(`add_assoc_stringl_ex(dst, ZEND_STRS("$3"), (char *) $2->name, $2->name_length, 1);') 
    99100#endif 
    100101    } 
     
    212213    define(`ELEMENTS_DONE', defn(`ELEMENTS_DONE')`,"$1"') 
    213214    IFASSERT(`dnl 
    214         if (zend_hash_exists(&done_names, "$1", sizeof("$1"))) { 
     215        if (zend_u_hash_exists(&done_names, IS_STRING, "$1", sizeof("$1"))) { 
    215216            fprintf(stderr 
    216217                , "duplicate field at %s `#'%d FUNC_NAME`' : %s\n" 
Note: See TracChangeset for help on using the changeset viewer.