diff options
author | Joe Watkins <krakjoe@php.net> | 2019-03-27 10:04:18 +0100 |
---|---|---|
committer | Joe Watkins <krakjoe@php.net> | 2019-03-27 10:04:36 +0100 |
commit | 56293d0637b3e9e706414e3f5689d153ba6bb1f2 (patch) | |
tree | e726709e0315209b7383e69ccdf7c40b71b8f410 /sapi/phpdbg/phpdbg.h | |
parent | f177a2ac586124374e13b93da0c0b9e0e4980ff6 (diff) | |
parent | eb405a2192bd8a0092c0795cd161d96b89f9d534 (diff) | |
download | php-git-56293d0637b3e9e706414e3f5689d153ba6bb1f2.tar.gz |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
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 06d2535fb9..c2298037d4 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 */ |