diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-03-27 10:03:50 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-03-27 10:04:07 +0100 |
| commit | eb405a2192bd8a0092c0795cd161d96b89f9d534 (patch) | |
| tree | be8ce2766fad5cf1759bf3581538105caee642ed /sapi/phpdbg/phpdbg.h | |
| parent | 1e4cff9ddb810a9038a8613719d7f91ad8bda64f (diff) | |
| parent | 7af270eb284c3bd00f6e5d80fbb0a2de9f89b693 (diff) | |
| download | php-git-eb405a2192bd8a0092c0795cd161d96b89f9d534.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77805 phpdbg build fails when readline is shared
Diffstat (limited to 'sapi/phpdbg/phpdbg.h')
| -rw-r--r-- | sapi/phpdbg/phpdbg.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h index 6d78033b5c..72501bffb4 100644 --- a/sapi/phpdbg/phpdbg.h +++ b/sapi/phpdbg/phpdbg.h @@ -83,12 +83,14 @@ #define zend_hash_str_add(...) zend_hash_str_add_tmp(__VA_ARGS__) #endif -#ifdef HAVE_LIBREADLINE -# include <readline/readline.h> -# include <readline/history.h> -#endif -#ifdef HAVE_LIBEDIT -# include <editline/readline.h> +#ifdef HAVE_PHPDBG_READLINE +# ifdef HAVE_LIBREADLINE +# include <readline/readline.h> +# include <readline/history.h> +# endif +# ifdef HAVE_LIBEDIT +# include <editline/readline.h> +# endif #endif /* {{{ remote console headers */ |