com php-src: Merge branch 'master' of https://github.com/krakjoe/phpdbg: config.m4 phpdbg_set.c phpdbg_utils.c

From: Date: Mon, 02 Dec 2013 13:25:20 +0000
Subject: com php-src: Merge branch 'master' of https://github.com/krakjoe/phpdbg: config.m4 phpdbg_set.c phpdbg_utils.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-75332@lists.php.net to get a copy of this message
Commit: fed41baf28b8451e30bdc0f4a8b8d590a35f323e Author: krakjoe <joe.watkins@live.co.uk> Mon, 2 Dec 2013 13:25:20 +0000 Parents: e05b4977c5538f10c8cda6aba013116153262ac2 e6970ade6d4332f24b847ea896b49be03d31674e Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fed41baf28b8451e30bdc0f4a8b8d590a35f323e Log: Merge branch 'master' of https://github.com/krakjoe/phpdbg Changed paths: MM config.m4 MM phpdbg_set.c MM phpdbg_utils.c Diff: diff --cc config.m4 index 7a1f164,7a1f164..640b5ac --- a/config.m4 +++ b/config.m4 @@@ -17,7 -17,7 +17,7 @@@ if test "$PHP_PHPDBG" != "no"; the AC_DEFINE(PHPDBG_DEBUG, 0, [ ]) fi -- PHP_PHPDBG_CFLAGS="-I$abc_srcdir" ++ PHP_PHPDBG_CFLAGS="-D_GNU_SOURCE" PHP_PHPDBG_FILES="phpdbg.c phpdbg_prompt.c phpdbg_help.c phpdbg_break.c phpdbg_print.c phpdbg_bp.c phpdbg_opcode.c phpdbg_list.c phpdbg_utils.c phpdbg_info.c phpdbg_cmd.c phpdbg_set.c" PHP_SUBST(PHP_PHPDBG_CFLAGS) diff --cc phpdbg_set.c index 0c046ee,10c73af..1c6d3be --- a/phpdbg_set.c +++ b/phpdbg_set.c @@@ -149,9 -130,10 +149,9 @@@ PHPDBG_SET(colors) /* {{{ * default: phpdbg_error( - "set colors used incorrectly: set colors <on|off>"); + "set colors used incorrectly: set colors <on|off>"); } -- + done: return SUCCESS; } /* }}} */ diff --cc phpdbg_utils.c index 4b58448,c81358d..67e1cbc --- a/phpdbg_utils.c +++ b/phpdbg_utils.c @@@ -19,6 -19,6 +19,7 @@@ #include <stdio.h> #include <ctype.h> ++#include <string.h> #include "zend.h" #include "php.h" #include "spprintf.h"

« previous php.cvs (#75332) next »