Changeset 836 for trunk/processor/head.m4
- Timestamp:
- 03/25/2012 03:59:20 AM (14 months ago)
- Files:
-
- 1 modified
-
trunk/processor/head.m4 (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/processor/head.m4
r825 r836 31 31 define(`SIZEOF_zval_ptr_nullable', `sizeof(zval_ptr_nullable)') 32 32 define(`COUNTOF_zval_ptr_nullable', `1') 33 define(`SIZEOF_zend_trait_alias_ptr', `sizeof(zend_trait_alias)') 34 define(`COUNTOF_zend_trait_alias_ptr', `1') 35 define(`SIZEOF_zend_trait_precedence_ptr', `sizeof(zend_trait_precedence)') 36 define(`COUNTOF_zend_trait_precedence_ptr', `1') 33 37 define(`SIZEOF_xc_entry_name_t', `sizeof(xc_entry_name_t)') 34 38 define(`COUNTOF_xc_entry_name_t', `1') … … 52 56 typedef zval *zval_ptr; 53 57 typedef zval *zval_ptr_nullable; 58 #ifdef ZEND_ENGINE_2_4 59 typedef zend_trait_alias *zend_trait_alias_ptr; 60 typedef zend_trait_precedence *zend_trait_precedence_ptr; 61 #endif 62 54 63 typedef zend_uchar zval_data_type; 55 64 #ifdef IS_UNICODE … … 92 101 }; 93 102 /* }}} */ 103 /* {{{ memsetptr */ 104 IFASSERT(`dnl 105 static void *memsetptr(void *mem, void *content, size_t n) 106 { 107 void **p = (void **) mem; 108 void **end = (char *) mem + n; 109 while (p < end) { 110 *p = content; 111 p += sizeof(content); 112 } 113 return mem; 114 } 115 ') 116 /* }}} */ 94 117 #ifdef HAVE_XCACHE_DPRINT 95 118 static void xc_dprint_indent(int indent) /* {{{ */ … … 315 338 /* {{{ field name checker */ 316 339 IFASSERT(`dnl 317 int xc_check_names(const char *file, int line, const char *functionName, const char **assert_names, int assert_names_count, HashTable *done_names)340 static int xc_check_names(const char *file, int line, const char *functionName, const char **assert_names, int assert_names_count, HashTable *done_names) 318 341 { 319 342 int errors = 0;

