summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2016-01-23 18:17:18 +0100
committerBob Weinand <bobwei9@hotmail.com>2016-01-23 18:17:18 +0100
commitcc9445ce684b78646c7b6145897c2be1da46b724 (patch)
tree2cc8df9821a9bf7691c19dbfdb4ca03ab5daaa7c
parent1091cec28fd49a8ca5e3902266626739918b1f56 (diff)
parent65ef7f8c33345bb40f0068604ad85555cadc9b44 (diff)
downloadphp-git-cc9445ce684b78646c7b6145897c2be1da46b724.tar.gz
Merge branch 'PHP-7.0'
-rw-r--r--sapi/phpdbg/phpdbg.c2
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;