andrey Fri, 18 Jun 2010 12:00:57 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=300568
Log:
missed this one in the last commit, the real type
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h 2010-06-18
11:56:25 UTC (rev 300567)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h 2010-06-18
12:00:57 UTC (rev 300568)
@@ -251,7 +251,7 @@
typedef enum_func_status (*func_mysqlnd_net__connect)(MYSQLND_NET * net,
const char * const scheme, size_t scheme_len, zend_bool persistent, char
**errstr, int * errcode TSRMLS_DC);
typedef size_t (*func_mysqlnd_net__send)(MYSQLND *
const conn, char * const buf, size_t count TSRMLS_DC);
-typedef size_t (*func_mysqlnd_net__receive)(MYSQLND *
conn, zend_uchar * buffer, size_t count TSRMLS_DC);
+typedef enum_func_status (*func_mysqlnd_net__receive)(MYSQLND * conn,
zend_uchar * buffer, size_t count TSRMLS_DC);
typedef enum_func_status
(*func_mysqlnd_net__set_client_option)(MYSQLND_NET * const net,
enum_mysqlnd_option option, const char * const value TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_net__network_read)(MYSQLND *
conn, zend_uchar * buffer, size_t count TSRMLS_DC);
typedef size_t
(*func_mysqlnd_net__network_write)(MYSQLND * const conn, const zend_uchar *
const buf, size_t count TSRMLS_DC);
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h 2010-06-18 11:56:25 UTC
(rev 300567)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h 2010-06-18 12:00:57 UTC
(rev 300568)
@@ -251,7 +251,7 @@
typedef enum_func_status (*func_mysqlnd_net__connect)(MYSQLND_NET * net,
const char * const scheme, size_t scheme_len, zend_bool persistent, char
**errstr, int * errcode TSRMLS_DC);
typedef size_t (*func_mysqlnd_net__send)(MYSQLND *
const conn, char * const buf, size_t count TSRMLS_DC);
-typedef size_t (*func_mysqlnd_net__receive)(MYSQLND *
conn, zend_uchar * buffer, size_t count TSRMLS_DC);
+typedef enum_func_status (*func_mysqlnd_net__receive)(MYSQLND * conn,
zend_uchar * buffer, size_t count TSRMLS_DC);
typedef enum_func_status
(*func_mysqlnd_net__set_client_option)(MYSQLND_NET * const net,
enum_mysqlnd_option option, const char * const value TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_net__network_read)(MYSQLND *
conn, zend_uchar * buffer, size_t count TSRMLS_DC);
typedef size_t
(*func_mysqlnd_net__network_write)(MYSQLND * const conn, const zend_uchar *
const buf, size_t count TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
