diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-02-10 12:58:19 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-02-10 12:58:19 +0000 |
| commit | daf3d0c875634547748b791fb6291e78103bf6dc (patch) | |
| tree | 667c296cf01f1d81a0b0199eb2245c6abb1fed19 /sapi/phpdbg | |
| parent | 3ac63df9bc27226c25cca5c87804896d33a7ab4f (diff) | |
| parent | aeb5319336aa447ad24968479b8aa249dd4c43a7 (diff) | |
| download | php-git-daf3d0c875634547748b791fb6291e78103bf6dc.tar.gz | |
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
Diffstat (limited to 'sapi/phpdbg')
| -rw-r--r-- | sapi/phpdbg/config.m4 | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sapi/phpdbg/config.m4 b/sapi/phpdbg/config.m4 index aa5b0efe3a..9fb4e62984 100644 --- a/sapi/phpdbg/config.m4 +++ b/sapi/phpdbg/config.m4 @@ -11,7 +11,7 @@ PHP_ARG_ENABLE(phpdbg-webhelper, for phpdbg web SAPI support, PHP_ARG_ENABLE(phpdbg-debug, for phpdbg debug build, [ --enable-phpdbg-debug Build phpdbg in debug mode], no, no) -if test "$BUILD_PHPDBG" == "" && test "$PHP_PHPDBG" != "no"; then +if test "$BUILD_PHPDBG" = "" && test "$PHP_PHPDBG" != "no"; then AC_HEADER_TIOCGWINSZ AC_DEFINE(HAVE_PHPDBG, 1, [ ]) diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 54e9a66f5f..8acf061983 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1297,7 +1297,7 @@ int main(int argc, char **argv) /* {{{ */ zend_bool init_file_default; char *oplog_file; size_t oplog_file_len; - zend_ulong flags; + uint64_t flags; char *php_optarg; int php_optind, opt, show_banner = 1; long cleaning = -1; |