Changeset 844 for trunk/processor/main.m4

Timestamp:

03/25/2012 09:18:30 AM (14 months ago)

Author:

moo

Message:

kill some warning

Files:

• trunk/processor/main.m4 (modified) (3 diffs)

trunk/processor/main.m4

@@ -58 +58 @@
         $1 = (FORCETYPE *) (processor->p = (char *) ALIGN(processor->p));
         ifelse(`$4', `', `
-                IFASSERT(`memsetptr($1, (void *) __LINE__, SIZE);')
+                IFASSERT(`memsetptr($1, (void *) (unsigned long) __LINE__, SIZE);')
             ', `
                 memset($1, 0, SIZE);
@@ -159 +159 @@
 define(`SETNULL', `SETNULL_EX(`dst->$1')DONE(`$1')')
 dnl }}}
+dnl {{{ SETZERO_EX
+define(`SETZERO_EX', `IFCOPY(`$1 = 0;')')
+define(`SETZERO', `SETZERO_EX(`dst->$1')DONE(`$1')')
+dnl }}}
 dnl {{{ COPYNULL_EX(1:dst, 2:elm-name)
 define(`COPYNULL_EX', `
@@ -169 +173 @@
 define(`COPYNULL', `
     COPYNULL_EX(`dst->$1', `$1')DONE(`$1')
+')
+dnl }}}
+dnl {{{ COPYZERO_EX(1:dst, 2:elm-name)
+define(`COPYZERO_EX', `
+    IFDASM(`add_assoc_long_ex(dst, ZEND_STRS("$2"), 0);')
+    IFNOTMEMCPY(`IFCOPY(`$1 = 0;')')
+    assert(patsubst($1, dst, src) == 0);
+')
+dnl }}}
+dnl {{{ COPYZERO(1:elm)
+define(`COPYZERO', `
+    COPYZERO_EX(`dst->$1', `$1')DONE(`$1')
 ')
 dnl }}}