diff options
author | Anatol Belski <ab@php.net> | 2014-12-16 12:22:27 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-12-16 12:22:27 +0100 |
commit | 9d70df24f8a35e7706d629151f43fc0757eb5f58 (patch) | |
tree | 5fc6230862ebec7648b71fe46a8d1e9bb442bd4a /sapi/phpdbg/phpdbg_info.c | |
parent | 24f0d2ed54dbc4d059978d45a8157adaa812ca0c (diff) | |
parent | 673003757f5c82eb79bdabb913069f1b7b2ad982 (diff) | |
download | php-git-9d70df24f8a35e7706d629151f43fc0757eb5f58.tar.gz |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
C89 fixes
use portable struct stat
fixed macro va args expansion for vs
Diffstat (limited to 'sapi/phpdbg/phpdbg_info.c')
-rw-r--r-- | sapi/phpdbg/phpdbg_info.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg_info.c b/sapi/phpdbg/phpdbg_info.c index a148a84b45..2c52b45686 100644 --- a/sapi/phpdbg/phpdbg_info.c +++ b/sapi/phpdbg/phpdbg_info.c @@ -386,8 +386,9 @@ PHPDBG_INFO(classes) /* {{{ */ phpdbg_print_class_name(ce); if (ce->parent) { + zend_class_entry *pce; phpdbg_xml("<parents %r>"); - zend_class_entry *pce = ce->parent; + pce = ce->parent; do { phpdbg_out("|-------- "); phpdbg_print_class_name(pce); |