com php-src: Fixed incompatible pointer: ext/mysqlnd/mysqlnd_ structs.h

From: Date: Tue, 26 Aug 2014 04:19:09 +0000
Subject: com php-src: Fixed incompatible pointer: ext/mysqlnd/mysqlnd_ structs.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81109@lists.php.net to get a copy of this message
Commit: 6469339a5819856a68c719170a48c2f9c80e5b33 Author: Xinchen Hui <laruence@php.net> Tue, 26 Aug 2014 12:19:09 +0800 Parents: dc6cd48efbd15ed3f2bdeae36b8dc3d125b838c4 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6469339a5819856a68c719170a48c2f9c80e5b33 Log: Fixed incompatible pointer Changed paths: M ext/mysqlnd/mysqlnd_structs.h Diff: diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h index 85e20a2...a50600f 100644 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@ -414,7 +414,7 @@ struct st_mysqlnd_object_factory_methods typedef enum_func_status (*func_mysqlnd_conn_data__init)(MYSQLND_CONN_DATA * conn TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__connect)(MYSQLND_CONN_DATA * conn, const char * host, const char * user, const char * passwd, unsigned int passwd_len, const char * db, unsigned int db_len, unsigned int port, const char * socket_or_pipe, unsigned int mysql_flags TSRMLS_DC); -typedef zend_long (*func_mysqlnd_conn_data__escape_string)(MYSQLND_CONN_DATA * const conn, char *newstr, const char *escapestr, size_t escapestr_len TSRMLS_DC); +typedef zend_ulong (*func_mysqlnd_conn_data__escape_string)(MYSQLND_CONN_DATA * const conn, char *newstr, const char *escapestr, size_t escapestr_len TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__set_charset)(MYSQLND_CONN_DATA * const conn, const char * const charset TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__query)(MYSQLND_CONN_DATA * conn, const char * query, unsigned int query_len TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn_data__send_query)(MYSQLND_CONN_DATA * conn, const char *query, unsigned int query_len TSRMLS_DC);

« previous php.cvs (#81109) next »