Fix compiler warnings in mysqlnd

diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c
index 4c3ee8b2a45287db147e5e38c6c0f13ce3db86d0..432bc78ade7eab75af526de667cc03ee34819547 100644 (file)
--- a/ext/mysqlnd/mysqlnd_ps.c
+++ b/ext/mysqlnd/mysqlnd_ps.c
@@ -1028,7 +1028,7 @@ MYSQLND_METHOD(mysqlnd_stmt, use_result)(MYSQLND_STMT * s)
 
 /* {{{ mysqlnd_fetch_row_cursor */
 enum_func_status
-mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES * result, void * param, unsigned int flags, zend_bool * fetched_anything)
+mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES * result, void * param, const unsigned int flags, zend_bool * fetched_anything)
 {
        enum_func_status ret;
        MYSQLND_STMT * s = (MYSQLND_STMT *) param;

diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index fa80ca1ca64f232ea0c025fdbaac7e5364adfe1a..c4aa537eb07b7acda82edbd2434ec500e94bc323 100644 (file)
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -1475,7 +1475,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result)(MYSQLND_RES * result,
                } else if (flags & MYSQLND_STORE_COPY) {
                        MYSQLND_RES_BUFFERED_C * set = (MYSQLND_RES_BUFFERED_C *) result->stored_data;
                        set->current_row = 0;
-                       set->initialized = mnd_pecalloc((set->row_count / 8) + 1, sizeof(zend_uchar), set->persistent); /* +1 for safety */
+                       set->initialized = mnd_pecalloc((unsigned int) ((set->row_count / 8) + 1), sizeof(zend_uchar), set->persistent); /* +1 for safety */
                }
        }
 

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h
index 234e3c8f0885f89683292991837a31db8b7fbb24..337143fb9f0d78a0acb81dc14769d0b18ab38aa4 100644 (file)
--- a/ext/mysqlnd/mysqlnd_wireprotocol.h
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.h
@@ -297,7 +297,7 @@ typedef struct  st_mysqlnd_packet_sha256_pk_request_response {
 
 
 zend_ulong             php_mysqlnd_net_field_length(const zend_uchar **packet);
-zend_uchar *   php_mysqlnd_net_store_length(zend_uchar *packet, uint64_t length);
+zend_uchar *   php_mysqlnd_net_store_length(zend_uchar *packet, const uint64_t length);
 size_t                 php_mysqlnd_net_store_length_size(uint64_t length);
 
 PHPAPI const extern char * const mysqlnd_empty_string;