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

diff --cc config.m4
index 7a1f16465ab481b1bd668ba89b6a6fd006205886,7a1f16465ab481b1bd668ba89b6a6fd006205886..640b5ac5aeacd0191d8a6faedacc13c64e3a27d1
--- 1/config.m4
--- 2/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 0c046eeaa17e5bec175441ab8f6f41b54f1e7224,10c73aff00bfe40dc23edde6fe2e08235e227239..1c6d3bef3cb4e806d8bdb53fd06d3e270593df2b
--- 1/phpdbg_set.c
--- 2/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 4b58448f0a9b674ee200981743ec6a93c0935d5e,c81358db283646f761c8f523ab12f5ac140afd27..67e1cbc4643da8f2fa3a9c84d995e1b9e06fc761
--- 1/phpdbg_utils.c
--- 2/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"