diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-02-03 16:30:19 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-02-03 16:30:19 +0000 |
| commit | 95a48213a0c81f54969b355f4974db5a24291486 (patch) | |
| tree | b362362a743bd76411df061e735bdf8dbb5d4d38 /sapi/phpdbg/phpdbg.c | |
| parent | ff1c97f0aab43449d942b591e4285b18ddd6180e (diff) | |
| parent | cdf99ffc6959c7038ce49ea5bf6e364c83cefd40 (diff) | |
| download | php-git-95a48213a0c81f54969b355f4974db5a24291486.tar.gz | |
Merge branch 'PHP-7.0' into openssl_error_store
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |