Changeset 1406 in svn


Ignore:
Timestamp:
2013-09-26T10:24:00Z (2 years ago)
Author:
Xuefer
Message:

fix pointer type mismatch warning

Location:
trunk/processor
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/hashtable.m4

    r1393 r1406  
    162162        ')
    163163        dnl TODO: fix pointer on arBuckets[n]
    164         FIXPOINTER(Bucket, arBuckets)
     164        FIXPOINTER(Bucket *, arBuckets)
    165165#ifdef ZEND_ENGINE_2_4
    166166    }
  • trunk/processor/main.m4

    r1380 r1406  
    126126define(`FIXPOINTER', `FIXPOINTER_EX(`$1', `DST(`$2')')')
    127127define(`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);
    129129')')
    130130define(`UNFIXPOINTER', `UNFIXPOINTER_EX(`$1', `DST(`$2')')')
    131131define(`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);
    133133')')
    134134dnl }}}
  • trunk/processor/processor.m4

    r1388 r1406  
    674674                assert(Z_OP(DST(`op1')).jmp_addr >= processor->active_op_array_dst->opcodes);
    675675                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')
    677677                break;
    678678
     
    692692                assert(Z_OP(DST(`op2')).jmp_addr >= processor->active_op_array_dst->opcodes);
    693693                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')
    695695                break;
    696696
Note: See TracChangeset for help on using the changeset viewer.