diff options
| author | Andrey Hristov <andrey@php.net> | 2013-12-04 12:07:18 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2013-12-04 12:07:18 +0200 |
| commit | ceb1b7e20fdbbdb121a67242d0848ab923915e65 (patch) | |
| tree | 6b09bf1748f19710f2d1cbbf8547584b67d48d26 /ext/mysqli/mysqli_nonapi.c | |
| parent | 00a7b1ff7fed49df51d0392d47aa79f63bf1c66e (diff) | |
| parent | 86aad979798a665e3f23aafb200390d51d44f8fa (diff) | |
| download | php-git-ceb1b7e20fdbbdb121a67242d0848ab923915e65.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'ext/mysqli/mysqli_nonapi.c')
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index c24b974de8..b5630c3e7f 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -775,7 +775,7 @@ PHP_FUNCTION(mysqli_poll) MYSQLND **new_r_array = NULL, **new_e_array = NULL, **new_dont_poll_array = NULL; long sec = 0, usec = 0; enum_func_status ret; - uint desc_num; + int desc_num; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!a!al|l", &r_array, &e_array, &dont_poll_array, &sec, &usec) == FAILURE) { return; |