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/mysqlnd/mysqlnd.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/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 6e17412edb..9e3e6e72df 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -1340,7 +1340,7 @@ static int mysqlnd_stream_array_from_fd_set(MYSQLND ** conn_array, fd_set * fds /* {{{ _mysqlnd_poll */ PHPAPI enum_func_status -_mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array, MYSQLND ***dont_poll, long sec, long usec, uint * desc_num TSRMLS_DC) +_mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array, MYSQLND ***dont_poll, long sec, long usec, int * desc_num TSRMLS_DC) { struct timeval tv; struct timeval *tv_p = NULL; |