diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-04-09 01:17:10 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-04-09 01:17:10 +0300 |
| commit | fe0a0897bab5fb8de14478f800f36af6d559164e (patch) | |
| tree | b9b351c147efeb2b07eb40d872c85743c04b33ca /Zend/zend_execute.c | |
| parent | 07df6594b5c71b176b376aba8007bc33616bbfb0 (diff) | |
| parent | 8e5a2096a92d472fbe47547dac4659a2556f446d (diff) | |
| download | php-git-fe0a0897bab5fb8de14478f800f36af6d559164e.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Repare SWITCH VM
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 0039f747ee..bb3ca87b04 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -65,7 +65,7 @@ # pragma GCC diagnostic warning "-Wvolatile-register-var" #endif -#ifdef ZEND_VM_FP_GLOBAL_REG +#if defined(ZEND_VM_FP_GLOBAL_REG) && ((ZEND_VM_KIND == ZEND_VM_KIND_CALL) || (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID)) # define EXECUTE_DATA_D void # define EXECUTE_DATA_C # define EXECUTE_DATA_DC @@ -79,7 +79,7 @@ # define NO_EXECUTE_DATA_CC , NULL #endif -#ifdef ZEND_VM_IP_GLOBAL_REG +#if defined(ZEND_VM_FP_GLOBAL_REG) && ((ZEND_VM_KIND == ZEND_VM_KIND_CALL) || (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID)) # define OPLINE_D void # define OPLINE_C # define OPLINE_DC |