Ignore:
Timestamp:
2012-06-23T06:49:59+02:00 (3 years ago)
Author:
moo
Message:

kill sign/const warning

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/processor.m4

    r880 r917  
    141141dnl }}} 
    142142        DONE(value) 
    143         PROCESS(xc_zval_data_type, type) 
     143        PROCESS(xc_zval_type_t, type) 
    144144#ifdef ZEND_ENGINE_2_3 
    145145        PROCESS(zend_uchar, is_ref__gc) 
     
    380380 
    381381#ifdef ZEND_ENGINE_2_4 
    382     STRUCT_ARRAY(default_properties_count, zval_ptr_nullable, default_properties_table) 
     382    STRUCT_ARRAY(int, default_properties_count, zval_ptr_nullable, default_properties_table) 
    383383    PROCESS(int, default_properties_count) 
    384     STRUCT_ARRAY(default_static_members_count, zval_ptr_nullable, default_static_members_table) 
     384    STRUCT_ARRAY(int, default_static_members_count, zval_ptr_nullable, default_static_members_table) 
    385385    PROCESS(int, default_static_members_count) 
    386386    IFCOPY(`dst->static_members_table = dst->default_static_members_table;') 
     
    411411    COPYNULL(traits) 
    412412    COPYZERO(num_traits) 
    413     STRUCT_ARRAY(, zend_trait_alias_ptr, trait_aliases) 
    414     STRUCT_ARRAY(, zend_trait_precedence_ptr, trait_precedences) 
     413    STRUCT_ARRAY(, , zend_trait_alias_ptr, trait_aliases) 
     414    STRUCT_ARRAY(, , zend_trait_precedence_ptr, trait_precedences) 
    415415#   endif 
    416416#else 
     
    716716        STRUCT_P(HashTable, static_variables, HashTable_zval_ptr) 
    717717#ifdef ZEND_ENGINE_2 
    718         STRUCT_ARRAY(num_args, zend_arg_info, arg_info) 
     718        STRUCT_ARRAY(zend_uint, num_args, zend_arg_info, arg_info) 
    719719        gc_arg_info = 1; 
    720720#endif 
     
    793793#ifdef ZEND_ENGINE_2 
    794794    PROCESS(zend_uint, fn_flags) 
    795     STRUCT_ARRAY(num_args, zend_arg_info, arg_info) 
     795    STRUCT_ARRAY(zend_uint, num_args, zend_arg_info, arg_info) 
    796796    PROCESS(zend_uint, num_args) 
    797797    PROCESS(zend_uint, required_num_args) 
     
    833833#ifdef ZEND_ENGINE_2_4 
    834834    dnl used when copying opcodes 
    835     STRUCT_ARRAY(last_literal, zend_literal, literals) 
     835    STRUCT_ARRAY(int, last_literal, zend_literal, literals) 
    836836    PROCESS(int, last_literal) 
    837837#endif 
    838838 
    839839    dnl uses literals 
    840     STRUCT_ARRAY(last, zend_op, opcodes) 
     840    STRUCT_ARRAY(zend_uint, last, zend_op, opcodes) 
    841841    PROCESS(zend_uint, last) 
    842842#ifndef ZEND_ENGINE_2_4 
     
    845845 
    846846#ifdef IS_CV 
    847     STRUCT_ARRAY(last_var, zend_compiled_variable, vars) 
     847    STRUCT_ARRAY(int, last_var, zend_compiled_variable, vars) 
    848848    PROCESS(int, last_var) 
    849849#   ifndef ZEND_ENGINE_2_4 
     
    859859    PROCESS(zend_uint, T) 
    860860 
    861     STRUCT_ARRAY(last_brk_cont, zend_brk_cont_element, brk_cont_array) 
    862     PROCESS(zend_uint, last_brk_cont) 
     861    STRUCT_ARRAY(last_brk_cont_t, last_brk_cont, zend_brk_cont_element, brk_cont_array) 
     862    PROCESS(last_brk_cont_t, last_brk_cont) 
    863863#ifndef ZEND_ENGINE_2_4 
    864864    PROCESS(zend_uint, current_brk_cont) 
     
    869869 
    870870#ifdef ZEND_ENGINE_2 
    871     STRUCT_ARRAY(last_try_catch, zend_try_catch_element, try_catch_array) 
     871    STRUCT_ARRAY(int, last_try_catch, zend_try_catch_element, try_catch_array) 
    872872    PROCESS(int, last_try_catch) 
    873873#endif 
     
    997997#ifdef ZEND_ENGINE_2_4 
    998998    PROCESS(zend_uint, literalinfo_cnt) 
    999     STRUCT_ARRAY(literalinfo_cnt, xc_op_array_info_detail_t, literalinfos) 
     999    STRUCT_ARRAY(zend_uint, literalinfo_cnt, xc_op_array_info_detail_t, literalinfos) 
    10001000#else 
    10011001    PROCESS(zend_uint, oplineinfo_cnt) 
    1002     STRUCT_ARRAY(oplineinfo_cnt, xc_op_array_info_detail_t, oplineinfos) 
     1002    STRUCT_ARRAY(zend_uint, oplineinfo_cnt, xc_op_array_info_detail_t, oplineinfos) 
    10031003#endif 
    10041004') 
     
    10351035    PROCESS(zend_uint, methodinfo_cnt) 
    10361036    IFRESTORE(`COPY(methodinfos)', ` 
    1037         STRUCT_ARRAY(methodinfo_cnt, xc_op_array_info_t, methodinfos) 
     1037        STRUCT_ARRAY(zend_uint, methodinfo_cnt, xc_op_array_info_t, methodinfos) 
    10381038    ') 
    10391039    IFRESTORE(` 
     
    11031103#ifdef HAVE_XCACHE_CONSTANT 
    11041104    PROCESS(zend_uint, constinfo_cnt) 
    1105     STRUCT_ARRAY(constinfo_cnt, xc_constinfo_t, constinfos) 
     1105    STRUCT_ARRAY(zend_uint, constinfo_cnt, xc_constinfo_t, constinfos) 
    11061106#endif 
    11071107 
    11081108    PROCESS(zend_uint, funcinfo_cnt) 
    1109     STRUCT_ARRAY(funcinfo_cnt, xc_funcinfo_t, funcinfos) 
     1109    STRUCT_ARRAY(zend_uint, funcinfo_cnt, xc_funcinfo_t, funcinfos) 
    11101110 
    11111111    PROCESS(zend_uint, classinfo_cnt) 
    1112     STRUCT_ARRAY(classinfo_cnt, xc_classinfo_t, classinfos, , IFRESTORE(`processor->active_class_index')) 
     1112    STRUCT_ARRAY(zend_uint, classinfo_cnt, xc_classinfo_t, classinfos, , IFRESTORE(`processor->active_class_index')) 
    11131113#ifdef ZEND_ENGINE_2_1 
    11141114    PROCESS(zend_uint, autoglobal_cnt) 
     
    11161116        COPY(autoglobals) 
    11171117    ', ` 
    1118         STRUCT_ARRAY(autoglobal_cnt, xc_autoglobal_t, autoglobals) 
     1118        STRUCT_ARRAY(zend_uint, autoglobal_cnt, xc_autoglobal_t, autoglobals) 
    11191119    ') 
    11201120#endif 
     
    11241124        COPY(compilererrors) 
    11251125    ', ` 
    1126         STRUCT_ARRAY(compilererror_cnt, xc_compilererror_t, compilererrors) 
     1126        STRUCT_ARRAY(zend_uint, compilererror_cnt, xc_compilererror_t, compilererrors) 
    11271127    ') 
    11281128#endif 
Note: See TracChangeset for help on using the changeset viewer.