diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-04-21 23:29:25 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-04-21 23:30:08 +0200 |
| commit | 708af5fd8e3b279aa2f6343e369e26a67d8bedc1 (patch) | |
| tree | c3a3dc604892553cb5ad67bc6abcc15a50b189cc /sapi/phpdbg/phpdbg_opcode.c | |
| parent | 32d5f269a03b554a0d3ebc96fcacc842e3344e4e (diff) | |
| parent | 447ec05f3160628ef6dc7f7eee34bae866af8e5c (diff) | |
| download | php-git-708af5fd8e3b279aa2f6343e369e26a67d8bedc1.tar.gz | |
Merge sapi/phpdbg into PHP-5.6
Diffstat (limited to 'sapi/phpdbg/phpdbg_opcode.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_opcode.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sapi/phpdbg/phpdbg_opcode.c b/sapi/phpdbg/phpdbg_opcode.c index 50073eb22b..6b13625fc1 100644 --- a/sapi/phpdbg/phpdbg_opcode.c +++ b/sapi/phpdbg/phpdbg_opcode.c @@ -183,6 +183,7 @@ void phpdbg_print_opline(zend_execute_data *execute_data, zend_bool ignore_flags const char *phpdbg_decode_opcode(zend_uchar opcode) /* {{{ */ { +#if ZEND_EXTENSION_API_NO <= PHP_5_5_API_NO #define CASE(s) case s: return #s switch (opcode) { CASE(ZEND_NOP); @@ -360,4 +361,8 @@ const char *phpdbg_decode_opcode(zend_uchar opcode) /* {{{ */ default: return "UNKNOWN"; } +#else + const char *ret = zend_get_opcode_name(opcode); + return ret?ret:"UNKNOWN"; +#endif } /* }}} */ |