Changeset 1406 in svn

Timestamp:

2013-09-26T10:24:00Z (5 years ago)

Author:

Xuefer

Message:

fix pointer type mismatch warning

Location:

trunk/processor

Files:

• hashtable.m4 (modified) (1 diff)
• main.m4 (modified) (1 diff)
• processor.m4 (modified) (2 diffs)

trunk/processor/hashtable.m4

@@ -162 +162 @@
         ')
         dnl TODO: fix pointer on arBuckets[n]
-        FIXPOINTER(Bucket, arBuckets)
+        FIXPOINTER(Bucket *, arBuckets)
 #ifdef ZEND_ENGINE_2_4
     }

trunk/processor/main.m4

@@ -126 +126 @@
 define(`FIXPOINTER', `FIXPOINTER_EX(`$1', `DST(`$2')')')
 define(`FIXPOINTER_EX', `IFSTORE(`
-    $2 = ($1 *) processor->shm->handlers->to_readonly(processor->shm, (char *)$2);
+    $2 = ($1 *) processor->shm->handlers->to_readonly(processor->shm, (void *)$2);
 ')')
 define(`UNFIXPOINTER', `UNFIXPOINTER_EX(`$1', `DST(`$2')')')
 define(`UNFIXPOINTER_EX', `IFSTORE(`
-    $2 = ($1 *) processor->shm->handlers->to_readwrite(processor->shm, (char *)$2);
+    $2 = ($1 *) processor->shm->handlers->to_readwrite(processor->shm, (void *)$2);
 ')')
 dnl }}}

trunk/processor/processor.m4

@@ -674 +674 @@
                 assert(Z_OP(DST(`op1')).jmp_addr >= processor->active_op_array_dst->opcodes);
                 assert(Z_OP(DST(`op1')).jmp_addr - processor->active_op_array_dst->opcodes < processor->active_op_array_dst->last);
-                FIXPOINTER_EX(zend_op *, `Z_OP(DST(`op1')).jmp_addr')
+                FIXPOINTER_EX(zend_op, `Z_OP(DST(`op1')).jmp_addr')
                 break;
 
@@ -692 +692 @@
                 assert(Z_OP(DST(`op2')).jmp_addr >= processor->active_op_array_dst->opcodes);
                 assert(Z_OP(DST(`op2')).jmp_addr - processor->active_op_array_dst->opcodes < processor->active_op_array_dst->last);
-                FIXPOINTER_EX(zend_op *, `Z_OP(DST(`op2')).jmp_addr')
+                FIXPOINTER_EX(zend_op, `Z_OP(DST(`op2')).jmp_addr')
                 break;