com php-src: Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit: sapi/phpdbg/phpdbg.h
sapi/phpdbg/phpdbg_utils.c
| From: | Remi Collet | Date: | Mon, 23 Jun 2014 08:21:19 +0000 |
| Subject: | com php-src: Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit: sapi/phpdbg/phpdbg.h sapi/phpdbg/phpdbg_utils.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79015@lists.php.net to get a copy of this message | ||
Commit: 0da5d94a6c840af835a5b5d8bc4284a588d727bf
Author: Remi Collet <remi@php.net> Mon, 23 Jun 2014 10:17:43 +0200
Parents: 0febafcfbe3e35f4a230430368ba931f19f8e957
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0da5d94a6c840af835a5b5d8bc4284a588d727bf
Log:
Better fix for phpdbg + libedit
- fix include
- disable coloured prompt only with libedit
Changed paths:
M sapi/phpdbg/phpdbg.h
M sapi/phpdbg/phpdbg_utils.c
Diff:
diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h
index b2e7a03..eb4faf1 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 <readline/readline.h>
# include <readline/history.h>
#endif
+#ifdef HAVE_LIBEDIT
+# include <editline/readline.h>
+#endif
#include "phpdbg_lexer.h"
#include "phpdbg_cmd.h"
diff --git a/sapi/phpdbg/phpdbg_utils.c b/sapi/phpdbg/phpdbg_utils.c
index 3b4eac7..3ce2fad 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(