From 0da5d94a6c840af835a5b5d8bc4284a588d727bf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 23 Jun 2014 10:17:43 +0200 Subject: [PATCH] Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit --- sapi/phpdbg/phpdbg.h | 5 ++++- sapi/phpdbg/phpdbg_utils.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h index b2e7a03c21..eb4faf1f94 100644 --- a/sapi/phpdbg/phpdbg.h +++ b/sapi/phpdbg/phpdbg.h @@ -64,10 +64,13 @@ # include "TSRM.h" #endif -#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT) +#ifdef LIBREADLINE # include # include #endif +#ifdef HAVE_LIBEDIT +# include +#endif #include "phpdbg_lexer.h" #include "phpdbg_cmd.h" diff --git a/sapi/phpdbg/phpdbg_utils.c b/sapi/phpdbg/phpdbg_utils.c index 3b4eac7327..3ce2fade17 100644 --- a/sapi/phpdbg/phpdbg_utils.c +++ b/sapi/phpdbg/phpdbg_utils.c @@ -400,7 +400,7 @@ PHPDBG_API const char *phpdbg_get_prompt(TSRMLS_D) /* {{{ */ } /* create cached prompt */ -#ifdef HAVE_LIBREADLINE +#ifndef HAVE_LIBEDIT /* TODO: libedit doesn't seems to support coloured prompt */ if ((PHPDBG_G(flags) & PHPDBG_IS_COLOURED)) { asprintf( -- 2.50.1