andrey Thu Nov 6 11:26:07 2008 UTC
Modified files:
/php-src/ext/mysqlnd config-win.h mysqlnd_ps.c
Log:
More cleanup of config-win.h and missed merge, which actually occured in 5_3
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config-win.h?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqlnd/config-win.h
diff -u php-src/ext/mysqlnd/config-win.h:1.3
php-src/ext/mysqlnd/config-win.h:1.4
--- php-src/ext/mysqlnd/config-win.h:1.3 Thu Nov 6 10:36:30 2008
+++ php-src/ext/mysqlnd/config-win.h Thu Nov 6 11:26:07 2008
@@ -10,13 +10,6 @@
#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 @@
#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
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_ps.c?r1=1.23&r2=1.24&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_ps.c
diff -u php-src/ext/mysqlnd/mysqlnd_ps.c:1.23
php-src/ext/mysqlnd/mysqlnd_ps.c:1.24
--- php-src/ext/mysqlnd/mysqlnd_ps.c:1.23 Fri Oct 31 20:30:33 2008
+++ php-src/ext/mysqlnd/mysqlnd_ps.c Thu Nov 6 11:26:07 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_ps.c,v 1.23 2008/10/31 20:30:33 andrey Exp $ */
+/* $Id: mysqlnd_ps.c,v 1.24 2008/11/06 11:26:07 andrey Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_wireprotocol.h"
@@ -58,7 +58,7 @@
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 @@
}
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_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 @@
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_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 @@
/* {{{ 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",
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
