com php-src: fix type for op num: Zend/zend_compile.c Zen d/zend_compile.h

Commit: 6fb3434592e1d542ee24bec7d593c1ea0a0efafb Author: Anatol Belski <ab@php.net> Mon, 3 Feb 2014 15:03:59 +0100 Parents: 7af9b01e267e5cff1425b5a1624658079437e297 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6fb3434592e1d542ee24bec7d593c1ea0a0efafb Log: fix type for op num Changed paths: M Zend/zend_compile.c M Zend/zend_compile.h Diff: diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index ec3298d..53dfb24 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -973,7 +973,7 @@ void zend_do_assign(znode *result, znode *variable, znode *value TSRMLS_DC) /* { last_op->result.var == variable->u.op.var) { if (last_op->opcode == ZEND_FETCH_OBJ_W) { if (n > 0) { - int opline_no = (opline-CG(active_op_array)->opcodes)/sizeof(*opline); + zend_size_t opline_no = (opline-CG(active_op_array)->opcodes)/sizeof(*opline); *opline = *last_op; MAKE_NOP(last_op); /* last_op = opline; */ @@ -988,7 +988,7 @@ void zend_do_assign(znode *result, znode *variable, znode *value TSRMLS_DC) /* { return; } else if (last_op->opcode == ZEND_FETCH_DIM_W) { if (n > 0) { - int opline_no = (opline-CG(active_op_array)->opcodes)/sizeof(*opline); + zend_size_t opline_no = (opline-CG(active_op_array)->opcodes)/sizeof(*opline); *opline = *last_op; MAKE_NOP(last_op); /* last_op = opline; */ diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 3690764..952c651 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -78,7 +78,7 @@ typedef struct _zend_literal { typedef union _znode_op { zend_uint constant; zend_uint var; - zend_uint num; + zend_size_t num; zend_uint_t hash; zend_uint opline_num; /* Needs to be signed */ zend_op *jmp_addr;