com php-src: fix flag signness: ext/mysqlnd/mysqlnd.c ext/mysqlnd/mysqlnd_structs.h
| From: | Anatol Belski | Date: | Tue, 04 Feb 2014 17:52:45 +0000 |
| Subject: | com php-src: fix flag signness: ext/mysqlnd/mysqlnd.c ext/mysqlnd/mysqlnd_structs.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75899@lists.php.net to get a copy of this message | ||
Commit: 971a4a52e338b18ca6a81c0ae059cf12755c4606
Author: Anatol Belski <ab@php.net> Tue, 4 Feb 2014 18:52:45 +0100
Parents: 1f8153a5336ed340ca9b6f4fcac8aa03829e5bd7
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=971a4a52e338b18ca6a81c0ae059cf12755c4606
Log:
fix flag signness
Changed paths:
M ext/mysqlnd/mysqlnd.c
M ext/mysqlnd/mysqlnd_structs.h
Diff:
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index d1f057e..714e4bc 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -2680,7 +2680,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_cor_options_to_string)(const
MYSQLND_CONN_D
/* {{{ mysqlnd_conn_data::tx_commit_ex */
static enum_func_status
-MYSQLND_METHOD(mysqlnd_conn_data, tx_commit_or_rollback)(MYSQLND_CONN_DATA * conn, const zend_bool
commit, const php_int_t flags, const char * const name TSRMLS_DC)
+MYSQLND_METHOD(mysqlnd_conn_data, tx_commit_or_rollback)(MYSQLND_CONN_DATA * conn, const zend_bool
commit, const php_uint_t flags, const char * const name TSRMLS_DC)
{
size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, tx_commit_or_rollback);
enum_func_status ret = FAIL;
diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index 51f9516..57f8512 100644
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -484,7 +484,7 @@ typedef enum_func_status (*func_mysqlnd_conn_data__set_autocommit)(MYSQLND_CONN_
typedef enum_func_status (*func_mysqlnd_conn_data__tx_commit)(MYSQLND_CONN_DATA * conn TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_conn_data__tx_rollback)(MYSQLND_CONN_DATA * conn
TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_conn_data__tx_begin)(MYSQLND_CONN_DATA * conn, const
php_uint_t mode, const char * const name TSRMLS_DC);
-typedef enum_func_status (*func_mysqlnd_conn_data__tx_commit_or_rollback)(MYSQLND_CONN_DATA * conn,
const zend_bool commit, const php_int_t flags, const char * const name TSRMLS_DC);
+typedef enum_func_status (*func_mysqlnd_conn_data__tx_commit_or_rollback)(MYSQLND_CONN_DATA * conn,
const zend_bool commit, const php_uint_t flags, const char * const name TSRMLS_DC);
typedef void (*func_mysqlnd_conn_data__tx_cor_options_to_string)(const MYSQLND_CONN_DATA * const
conn, smart_str * tmp_str, const php_int_t mode TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_conn_data__tx_savepoint)(MYSQLND_CONN_DATA * conn, const
char * const name TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_conn_data__tx_savepoint_release)(MYSQLND_CONN_DATA * conn,
const char * const name TSRMLS_DC);