Fix problems in Windows build

diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index 0542b271ca8316e17369a71ea0e43ca58f4f6d08..31367d53c9dcac406928248a89e7dedba40d4332 100644 (file)
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -62,8 +62,8 @@ typedef struct st_mysqlnd_upsert_result
 {
        unsigned int            warning_count;
        unsigned int            server_status;
-       unsigned long long      affected_rows;
-       unsigned long long      last_insert_id;
+       mynd_ulonglong          affected_rows;
+       mynd_ulonglong          last_insert_id;
 } mysqlnd_upsert_status;
 
 
@@ -344,7 +344,7 @@ struct st_mysqlnd_connection
        char                    *passwd;
        unsigned int    *passwd_len;
        char                    *scheme;
-       unsigned long long      thread_id;
+       mynd_ulonglong  thread_id;
        char                    *server_version;
        char                    *host_info;
        unsigned char   *scramble;

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h
index f48df1cba810a29d79b0cb1e0060947c350989cb..96da8d16a8a3b548ec885943e0db30d5f3c9e508 100644 (file)
--- a/ext/mysqlnd/mysqlnd_wireprotocol.h
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.h
@@ -225,8 +225,8 @@ typedef struct st_php_mysql_packet_rset_header {
        */
        mysqlnd_2b                      warning_count;
        mysqlnd_2b                      server_status;
-       unsigned long long      affected_rows;
-       unsigned long long      last_insert_id;
+       mynd_ulonglong          affected_rows;
+       mynd_ulonglong          last_insert_id;
        /* This is for both LOAD DATA or info, when no result set */
        char                            *info_or_local_file;
        size_t                          info_or_local_file_len;