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.h | |
| 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.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h index 40933630ed..1514feb370 100644 --- a/ext/mysqlnd/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h @@ -117,7 +117,7 @@ PHPAPI void _mysqlnd_debug(const char *mode TSRMLS_DC); #define mysqlnd_reap_async_query(conn) ((conn)->data)->m->reap_query((conn)->data TSRMLS_CC) #define mysqlnd_unbuffered_skip_result(result) (result)->m.skip_result((result) TSRMLS_CC) -PHPAPI enum_func_status _mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array, MYSQLND ***dont_poll, long sec, long usec, uint * desc_num TSRMLS_DC); +PHPAPI enum_func_status _mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array, MYSQLND ***dont_poll, long sec, long usec, int * desc_num TSRMLS_DC); #define mysqlnd_use_result(conn) ((conn)->data)->m->use_result((conn)->data TSRMLS_CC) #define mysqlnd_store_result(conn) ((conn)->data)->m->store_result((conn)->data TSRMLS_CC) |