Changeset 1406 in svn
- Timestamp:
- 2013-09-26T10:24:00Z (5 years ago)
- Location:
- trunk/processor
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/processor/hashtable.m4
r1393 r1406 162 162 ') 163 163 dnl TODO: fix pointer on arBuckets[n] 164 FIXPOINTER(Bucket , arBuckets)164 FIXPOINTER(Bucket *, arBuckets) 165 165 #ifdef ZEND_ENGINE_2_4 166 166 } -
trunk/processor/main.m4
r1380 r1406 126 126 define(`FIXPOINTER', `FIXPOINTER_EX(`$1', `DST(`$2')')') 127 127 define(`FIXPOINTER_EX', `IFSTORE(` 128 $2 = ($1 *) processor->shm->handlers->to_readonly(processor->shm, ( char*)$2);128 $2 = ($1 *) processor->shm->handlers->to_readonly(processor->shm, (void *)$2); 129 129 ')') 130 130 define(`UNFIXPOINTER', `UNFIXPOINTER_EX(`$1', `DST(`$2')')') 131 131 define(`UNFIXPOINTER_EX', `IFSTORE(` 132 $2 = ($1 *) processor->shm->handlers->to_readwrite(processor->shm, ( char*)$2);132 $2 = ($1 *) processor->shm->handlers->to_readwrite(processor->shm, (void *)$2); 133 133 ')') 134 134 dnl }}} -
trunk/processor/processor.m4
r1388 r1406 674 674 assert(Z_OP(DST(`op1')).jmp_addr >= processor->active_op_array_dst->opcodes); 675 675 assert(Z_OP(DST(`op1')).jmp_addr - processor->active_op_array_dst->opcodes < processor->active_op_array_dst->last); 676 FIXPOINTER_EX(zend_op *, `Z_OP(DST(`op1')).jmp_addr')676 FIXPOINTER_EX(zend_op, `Z_OP(DST(`op1')).jmp_addr') 677 677 break; 678 678 … … 692 692 assert(Z_OP(DST(`op2')).jmp_addr >= processor->active_op_array_dst->opcodes); 693 693 assert(Z_OP(DST(`op2')).jmp_addr - processor->active_op_array_dst->opcodes < processor->active_op_array_dst->last); 694 FIXPOINTER_EX(zend_op *, `Z_OP(DST(`op2')).jmp_addr')694 FIXPOINTER_EX(zend_op, `Z_OP(DST(`op2')).jmp_addr') 695 695 break; 696 696
Note: See TracChangeset
for help on using the changeset viewer.