diff options
author | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
---|---|---|
committer | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
commit | db72160e5ac2b267b9ffa23ad84e62e609382a44 (patch) | |
tree | 6e50c2826f98308d500cc826934a503751d4d566 /ext/mysqli/mysqli_report.c | |
parent | be88d0e5d4ab5fdf775f3e38cf054aa0451f0d36 (diff) | |
parent | f469dc7429f2257aac6f46228302408608fbd62f (diff) | |
download | php-git-db72160e5ac2b267b9ffa23ad84e62e609382a44.tar.gz |
Merge branch 'master' into integer_semantics
Conflicts:
Zend/zend_operators.h
Diffstat (limited to 'ext/mysqli/mysqli_report.c')
-rw-r--r-- | ext/mysqli/mysqli_report.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli_report.c b/ext/mysqli/mysqli_report.c index bdd3adaf5f..7703465e21 100644 --- a/ext/mysqli/mysqli_report.c +++ b/ext/mysqli/mysqli_report.c @@ -33,7 +33,7 @@ extern void php_mysqli_throw_sql_exception(char *sqlstate, int errorno TSRMLS_DC sets report level */ PHP_FUNCTION(mysqli_report) { - long flags; + zend_long flags; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &flags) == FAILURE) { |