More cleanup of config-win.h and missed merge, which actually occured in 5_3

diff --git a/ext/mysqlnd/config-win.h b/ext/mysqlnd/config-win.h
index 485f88258c3dec4bb57e42d2e519b7bcf1e0ac35..0d890f7166309c25319a855060cf1b07d860d580 100644 (file)
--- a/ext/mysqlnd/config-win.h
+++ b/ext/mysqlnd/config-win.h
@@ -10,13 +10,6 @@ This file is public domain and comes with NO WARRANTY of any kind */
 #include <io.h>
 #include <malloc.h>
 
-#if defined(__NT__)
-#define        SYSTEM_TYPE     "NT"
-#elif defined(__WIN2000__)
-#define        SYSTEM_TYPE     "WIN2000"
-#else
-#define        SYSTEM_TYPE     "Win95/Win98"
-#endif
 
 #ifndef _WIN64
 #ifndef _WIN32
@@ -27,21 +20,11 @@ This file is public domain and comes with NO WARRANTY of any kind */
 #endif
 #endif /* _WIN64 */
 #ifndef __WIN__
-#define __WIN__                       /* To make it easier in VC++ */
+#define __WIN__                                /* To make it easier in VC++ */
 #endif
 
-#define LONGLONG_MIN   ((__int64) 0x8000000000000000)
-#define LONGLONG_MAX   ((__int64) 0x7FFFFFFFFFFFFFFF)
-#define LL(A)          ((__int64) A)
-
 /* Type information */
 
-/*
-typedef unsigned int    uint;
-*/
-typedef int sigset_t;
-#define longlong_defined
-
 #define SIZEOF_CHAR            1
 #define SIZEOF_LONG            4
 #define SIZEOF_LONG_LONG       8

diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c
index 43beebc5d863a79ede49b371bf0a5ac9c4f1ddee..415a8fb00ca6c275c43035909dfea8a5e706ce72 100644 (file)
--- a/ext/mysqlnd/mysqlnd_ps.c
+++ b/ext/mysqlnd/mysqlnd_ps.c
@@ -58,7 +58,7 @@ enum_func_status mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param,
                                                                                           zend_bool *fetched_anything TSRMLS_DC);
 
 static void mysqlnd_stmt_separate_result_bind(MYSQLND_STMT * const stmt TSRMLS_DC);
-static void mysqlnd_stmt_separate_one_result_bind(MYSQLND_STMT * const stmt, uint param_no TSRMLS_DC);
+static void mysqlnd_stmt_separate_one_result_bind(MYSQLND_STMT * const stmt, unsigned int param_no TSRMLS_DC);
 
 static void mysqlnd_internal_free_stmt_content(MYSQLND_STMT * const stmt TSRMLS_DC);
 static enum_func_status mysqlnd_stmt_execute_parse_response(MYSQLND_STMT * const stmt TSRMLS_DC);
@@ -653,7 +653,7 @@ MYSQLND_METHOD(mysqlnd_stmt, execute)(MYSQLND_STMT * const stmt TSRMLS_DC)
        }
 
        if (stmt->param_count) {
-               uint i, not_bound = 0;
+               unsigned int i, not_bound = 0;
                if (!stmt->param_bind) {
                        SET_STMT_ERROR(stmt, CR_PARAMS_NOT_BOUND, UNKNOWN_SQLSTATE,
                                                         "No data supplied for parameters in prepared statement");
@@ -708,7 +708,7 @@ mysqlnd_fetch_stmt_row_buffered(MYSQLND_RES *result, void *param, unsigned int f
 {
        MYSQLND_STMT *stmt = (MYSQLND_STMT *) param;
        MYSQLND_RES_BUFFERED *set = result->stored_data;
-       uint field_count = result->meta->field_count;
+       unsigned int field_count = result->meta->field_count;
 
        DBG_ENTER("mysqlnd_fetch_stmt_row_buffered");
        DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
@@ -1477,7 +1477,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_result)(MYSQLND_STMT * const stmt,
        SET_EMPTY_ERROR(stmt->conn->error_info);
 
        if (stmt->field_count) {
-               uint i = 0;
+               unsigned int i = 0;
 
                if (!result_bind) {
                        DBG_ERR("no result bind passed");
@@ -1508,7 +1508,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_result)(MYSQLND_STMT * const stmt,
 
 /* {{{ mysqlnd_stmt::bind_result */
 static enum_func_status
-MYSQLND_METHOD(mysqlnd_stmt, bind_one_result)(MYSQLND_STMT * const stmt, uint param_no TSRMLS_DC)
+MYSQLND_METHOD(mysqlnd_stmt, bind_one_result)(MYSQLND_STMT * const stmt, unsigned int param_no TSRMLS_DC)
 {
        DBG_ENTER("mysqlnd_stmt::bind_result");
        DBG_INF_FMT("stmt=%lu field_count=%u", stmt->stmt_id, stmt->field_count);
@@ -1887,7 +1887,7 @@ void mysqlnd_stmt_separate_result_bind(MYSQLND_STMT * const stmt TSRMLS_DC)
 
 
 /* {{{ mysqlnd_stmt_separate_one_result_bind */
-void mysqlnd_stmt_separate_one_result_bind(MYSQLND_STMT * const stmt, uint param_no TSRMLS_DC)
+void mysqlnd_stmt_separate_one_result_bind(MYSQLND_STMT * const stmt, unsigned int param_no TSRMLS_DC)
 {
        DBG_ENTER("mysqlnd_stmt_separate_one_result_bind");
        DBG_INF_FMT("stmt=%lu result_bind=%p field_count=%u param_no=%d",