diff options
| author | kovacs.ferenc <kovacs.ferenc@ustream.tv> | 2014-06-14 23:48:17 +0200 |
|---|---|---|
| committer | kovacs.ferenc <kovacs.ferenc@ustream.tv> | 2014-06-14 23:48:24 +0200 |
| commit | e9c2e7d6e630ae660b6b5dc7269af58d4bf7bf54 (patch) | |
| tree | 3e7934eed27b9b618729ff8c258efda5771927b9 | |
| parent | fbb7bdc21e0bd869dd25a701d49d8daaf8ffe03a (diff) | |
| download | php-git-e9c2e7d6e630ae660b6b5dc7269af58d4bf7bf54.tar.gz | |
fix bugsnet #67212: phpdbg uses non-standard TIOCGWINSZ
| -rw-r--r-- | config.m4 | 1 | ||||
| -rw-r--r-- | phpdbg_utils.c | 5 |
2 files changed, 5 insertions, 1 deletions
@@ -9,6 +9,7 @@ PHP_ARG_ENABLE(phpdbg-debug, for phpdbg debug build, [ --enable-phpdbg-debug Build phpdbg in debug mode], no, no) if test "$PHP_PHPDBG" != "no"; then + AC_HEADER_TIOCGWINSZ AC_DEFINE(HAVE_PHPDBG, 1, [ ]) if test "$PHP_PHPDBG_DEBUG" != "no"; then diff --git a/phpdbg_utils.c b/phpdbg_utils.c index c77ecba564..98748b202a 100644 --- a/phpdbg_utils.c +++ b/phpdbg_utils.c @@ -32,6 +32,9 @@ # include "win32/time.h" #elif defined(HAVE_SYS_IOCTL_H) # include "sys/ioctl.h" +# ifndef GWINSZ_IN_SYS_IOCTL +# include <termios.h> +# endif #endif ZEND_EXTERN_MODULE_GLOBALS(phpdbg); @@ -437,7 +440,7 @@ PHPDBG_API int phpdbg_get_terminal_width(TSRMLS_D) /* {{{ */ GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi); columns = csbi.srWindow.Right - csbi.srWindow.Left + 1; -#elif defined(HAVE_SYS_IOCTL_H) +#elif defined(HAVE_SYS_IOCTL_H) && defined (TIOCGWINSZ) struct winsize w; columns = ioctl(fileno(stdout), TIOCGWINSZ, &w) == 0 ? w.ws_col : 80; |