Changeset 917 for trunk/processor/processor.m4

Timestamp:

2012-06-23T06:49:59+02:00 (11 months ago)

Author:

moo

Message:

kill sign/const warning

File:

• trunk/processor/processor.m4 (modified) (14 diffs)

trunk/processor/processor.m4

@@ -141 +141 @@
 dnl }}}
         DONE(value)
-        PROCESS(xc_zval_data_type, type)
+        PROCESS(xc_zval_type_t, type)
 #ifdef ZEND_ENGINE_2_3
         PROCESS(zend_uchar, is_ref__gc)
@@ -380 +380 @@
 
 #ifdef ZEND_ENGINE_2_4
-    STRUCT_ARRAY(default_properties_count, zval_ptr_nullable, default_properties_table)
+    STRUCT_ARRAY(int, default_properties_count, zval_ptr_nullable, default_properties_table)
     PROCESS(int, default_properties_count)
-    STRUCT_ARRAY(default_static_members_count, zval_ptr_nullable, default_static_members_table)
+    STRUCT_ARRAY(int, default_static_members_count, zval_ptr_nullable, default_static_members_table)
     PROCESS(int, default_static_members_count)
     IFCOPY(`dst->static_members_table = dst->default_static_members_table;')
@@ -411 +411 @@
     COPYNULL(traits)
     COPYZERO(num_traits)
-    STRUCT_ARRAY(, zend_trait_alias_ptr, trait_aliases)
-    STRUCT_ARRAY(, zend_trait_precedence_ptr, trait_precedences)
+    STRUCT_ARRAY(, , zend_trait_alias_ptr, trait_aliases)
+    STRUCT_ARRAY(, , zend_trait_precedence_ptr, trait_precedences)
 #   endif
 #else
@@ -716 +716 @@
         STRUCT_P(HashTable, static_variables, HashTable_zval_ptr)
 #ifdef ZEND_ENGINE_2
-        STRUCT_ARRAY(num_args, zend_arg_info, arg_info)
+        STRUCT_ARRAY(zend_uint, num_args, zend_arg_info, arg_info)
         gc_arg_info = 1;
 #endif
@@ -793 +793 @@
 #ifdef ZEND_ENGINE_2
     PROCESS(zend_uint, fn_flags)
-    STRUCT_ARRAY(num_args, zend_arg_info, arg_info)
+    STRUCT_ARRAY(zend_uint, num_args, zend_arg_info, arg_info)
     PROCESS(zend_uint, num_args)
     PROCESS(zend_uint, required_num_args)
@@ -833 +833 @@
 #ifdef ZEND_ENGINE_2_4
     dnl used when copying opcodes
-    STRUCT_ARRAY(last_literal, zend_literal, literals)
+    STRUCT_ARRAY(int, last_literal, zend_literal, literals)
     PROCESS(int, last_literal)
 #endif
 
     dnl uses literals
-    STRUCT_ARRAY(last, zend_op, opcodes)
+    STRUCT_ARRAY(zend_uint, last, zend_op, opcodes)
     PROCESS(zend_uint, last)
 #ifndef ZEND_ENGINE_2_4
@@ -845 +845 @@
 
 #ifdef IS_CV
-    STRUCT_ARRAY(last_var, zend_compiled_variable, vars)
+    STRUCT_ARRAY(int, last_var, zend_compiled_variable, vars)
     PROCESS(int, last_var)
 #   ifndef ZEND_ENGINE_2_4
@@ -859 +859 @@
     PROCESS(zend_uint, T)
 
-    STRUCT_ARRAY(last_brk_cont, zend_brk_cont_element, brk_cont_array)
-    PROCESS(zend_uint, last_brk_cont)
+    STRUCT_ARRAY(last_brk_cont_t, last_brk_cont, zend_brk_cont_element, brk_cont_array)
+    PROCESS(last_brk_cont_t, last_brk_cont)
 #ifndef ZEND_ENGINE_2_4
     PROCESS(zend_uint, current_brk_cont)
@@ -869 +869 @@
 
 #ifdef ZEND_ENGINE_2
-    STRUCT_ARRAY(last_try_catch, zend_try_catch_element, try_catch_array)
+    STRUCT_ARRAY(int, last_try_catch, zend_try_catch_element, try_catch_array)
     PROCESS(int, last_try_catch)
 #endif
@@ -997 +997 @@
 #ifdef ZEND_ENGINE_2_4
     PROCESS(zend_uint, literalinfo_cnt)
-    STRUCT_ARRAY(literalinfo_cnt, xc_op_array_info_detail_t, literalinfos)
+    STRUCT_ARRAY(zend_uint, literalinfo_cnt, xc_op_array_info_detail_t, literalinfos)
 #else
     PROCESS(zend_uint, oplineinfo_cnt)
-    STRUCT_ARRAY(oplineinfo_cnt, xc_op_array_info_detail_t, oplineinfos)
+    STRUCT_ARRAY(zend_uint, oplineinfo_cnt, xc_op_array_info_detail_t, oplineinfos)
 #endif
 ')
@@ -1035 +1035 @@
     PROCESS(zend_uint, methodinfo_cnt)
     IFRESTORE(`COPY(methodinfos)', `
-        STRUCT_ARRAY(methodinfo_cnt, xc_op_array_info_t, methodinfos)
+        STRUCT_ARRAY(zend_uint, methodinfo_cnt, xc_op_array_info_t, methodinfos)
     ')
     IFRESTORE(`
@@ -1103 +1103 @@
 #ifdef HAVE_XCACHE_CONSTANT
     PROCESS(zend_uint, constinfo_cnt)
-    STRUCT_ARRAY(constinfo_cnt, xc_constinfo_t, constinfos)
+    STRUCT_ARRAY(zend_uint, constinfo_cnt, xc_constinfo_t, constinfos)
 #endif
 
     PROCESS(zend_uint, funcinfo_cnt)
-    STRUCT_ARRAY(funcinfo_cnt, xc_funcinfo_t, funcinfos)
+    STRUCT_ARRAY(zend_uint, funcinfo_cnt, xc_funcinfo_t, funcinfos)
 
     PROCESS(zend_uint, classinfo_cnt)
-    STRUCT_ARRAY(classinfo_cnt, xc_classinfo_t, classinfos, , IFRESTORE(`processor->active_class_index'))
+    STRUCT_ARRAY(zend_uint, classinfo_cnt, xc_classinfo_t, classinfos, , IFRESTORE(`processor->active_class_index'))
 #ifdef ZEND_ENGINE_2_1
     PROCESS(zend_uint, autoglobal_cnt)
@@ -1116 +1116 @@
         COPY(autoglobals)
     ', `
-        STRUCT_ARRAY(autoglobal_cnt, xc_autoglobal_t, autoglobals)
+        STRUCT_ARRAY(zend_uint, autoglobal_cnt, xc_autoglobal_t, autoglobals)
     ')
 #endif
@@ -1124 +1124 @@
         COPY(compilererrors)
     ', `
-        STRUCT_ARRAY(compilererror_cnt, xc_compilererror_t, compilererrors)
+        STRUCT_ARRAY(zend_uint, compilererror_cnt, xc_compilererror_t, compilererrors)
     ')
 #endif