diff options
| author | Anatol Belski <ab@php.net> | 2014-10-29 20:04:56 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-29 20:04:56 +0100 |
| commit | d77ce317636919a87daa7f8ffb2979474f9cade7 (patch) | |
| tree | c9ebe2c7ad01661e7696a8f15d6d4842870f03ea /sapi/phpdbg/phpdbg_frame.c | |
| parent | 23f089a6b3586d524e8709d75262029bc8fa7ad4 (diff) | |
| parent | fc904569ea5c5513925a69bf43820845eb3db104 (diff) | |
| download | php-git-d77ce317636919a87daa7f8ffb2979474f9cade7.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix output globals importing
export output globals
use portable strndup implementation
unix sockets aren't available on windows
dll export APIs needed by phpdbg
fix sapi/phpdbg/config.w32
Don't treat warnings as failures in the junit output
Diffstat (limited to 'sapi/phpdbg/phpdbg_frame.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_frame.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg_frame.c b/sapi/phpdbg/phpdbg_frame.c index 08a6bec994..f42fc659f1 100644 --- a/sapi/phpdbg/phpdbg_frame.c +++ b/sapi/phpdbg/phpdbg_frame.c @@ -25,7 +25,6 @@ #include "phpdbg_list.h" ZEND_EXTERN_MODULE_GLOBALS(phpdbg); -ZEND_EXTERN_MODULE_GLOBALS(output); void phpdbg_restore_frame(TSRMLS_D) /* {{{ */ { |