Browse Source

fix pointer type mismatch warning

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@1406 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
3.1
Xuefer 8 years ago
parent
commit
8316f63cd1
  1. 2
      processor/hashtable.m4
  2. 4
      processor/main.m4
  3. 4
      processor/processor.m4

2
processor/hashtable.m4

@ -161,7 +161,7 @@ define(`DEF_HASH_TABLE_FUNC', `
}
')
dnl TODO: fix pointer on arBuckets[n]
FIXPOINTER(Bucket, arBuckets)
FIXPOINTER(Bucket *, arBuckets)
#ifdef ZEND_ENGINE_2_4
}
else { /* if (SRC(`nTableMask')) */

4
processor/main.m4

@ -125,11 +125,11 @@ dnl }}}
dnl {{{ FIXPOINTER
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 }}}
dnl {{{ COPY

4
processor/processor.m4

@ -673,7 +673,7 @@ DEF_STRUCT_P_FUNC(`zend_op', , `dnl {{{
Z_OP(DST(`op1')).jmp_addr = processor->active_op_array_dst->opcodes + (Z_OP(SRC(`op1')).jmp_addr - processor->active_op_array_src->opcodes);
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;
case ZEND_JMPZ:
@ -691,7 +691,7 @@ DEF_STRUCT_P_FUNC(`zend_op', , `dnl {{{
Z_OP(DST(`op2')).jmp_addr = processor->active_op_array_dst->opcodes + (Z_OP(SRC(`op2')).jmp_addr - processor->active_op_array_src->opcodes);
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;
default:

Loading…
Cancel
Save