From: krakjoe <joe.watkins@live.co.uk>
Date: Mon, 2 Dec 2013 13:25:20 +0000 (+0000)
Subject: Merge branch 'master' of https://github.com/krakjoe/phpdbg
X-Git-Tag: php-5.6.0alpha1~110^2~30^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fed41baf28b8451e30bdc0f4a8b8d590a35f323e;p=php

Merge branch 'master' of https://github.com/krakjoe/phpdbg
---

fed41baf28b8451e30bdc0f4a8b8d590a35f323e
diff --cc config.m4
index 7a1f16465a,7a1f16465a..640b5ac5ae
--- 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 0c046eeaa1,10c73aff00..1c6d3bef3c
--- 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 4b58448f0a,c81358db28..67e1cbc464
--- 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"