com php-src: fix windows build: Zend/zend_vm_def.h Zend /zend_vm_execute.h
| From: | Anatoliy Belsky | Date: | Mon, 13 Aug 2012 17:44:45 +0000 |
| Subject: | com php-src: fix windows build: Zend/zend_vm_def.h Zend /zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69819@lists.php.net to get a copy of this message | ||
Commit: baea290b6c0843afb23bf9ea2979a8de15a406ce
Author: Anatoliy Belsky <ab@php.net> Mon, 13 Aug 2012 19:44:45 +0200
Parents: f3192ea6e4405dded21cc81a6587374b019a6173
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=baea290b6c0843afb23bf9ea2979a8de15a406ce
Log:
fix windows build
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index ad9301d..1aded4e 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -5319,10 +5319,10 @@ ZEND_VM_HANDLER(156, ZEND_SEPARATE, VAR, UNUSED)
ZEND_VM_HANDLER(159, ZEND_LEAVE, ANY, ANY) {
{
- USE_OPLINE;
- SAVE_OPLINE();
+ USE_OPLINE
zend_uint i, op_num = opline - EG(active_op_array)->opcodes;
+ SAVE_OPLINE();
zend_exception_restore(TSRMLS_C);
if (EX(leaving)) {
zend_uint catch_op_num = 0, finally_op_num = 0;
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index df7c94f..c4fe9a9 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1177,10 +1177,10 @@ static int ZEND_FASTCALL
ZEND_USER_OPCODE_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS
static int ZEND_FASTCALL ZEND_LEAVE_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
- USE_OPLINE;
- SAVE_OPLINE();
+ USE_OPLINE
zend_uint i, op_num = opline - EG(active_op_array)->opcodes;
+ SAVE_OPLINE();
zend_exception_restore(TSRMLS_C);
if (EX(leaving)) {
zend_uint catch_op_num = 0, finally_op_num = 0;