PHP mysqlnd svn commit: r1012 - in trunk: php5/ext/mysqli php6/ext/mysqli

[ahristov]

Author: ahristov
Date: 2007-09-12 11:15:41 +0200 (Wed, 12 Sep 2007)
New Revision: 1012

Modified:
   trunk/php5/ext/mysqli/mysqli.c
   trunk/php6/ext/mysqli/mysqli.c
   trunk/php6/ext/mysqli/php_mysqli_structs.h
Log:
Add missing brackets for Windows. This code hasn't worked :(
Assigning function address for value of a long...huh :/




Modified: trunk/php5/ext/mysqli/mysqli.c
===================================================================
--- trunk/php5/ext/mysqli/mysqli.c	2007-09-11 11:15:32 UTC (rev 1011)
+++ trunk/php5/ext/mysqli/mysqli.c	2007-09-12 09:15:41 UTC (rev 1012)
@@ -789,7 +789,7 @@
 {
 #ifndef HAVE_MYSQLND
 #ifdef PHP_WIN32
-	unsigned long client_ver = mysql_get_client_version;
+	unsigned long client_ver = mysql_get_client_version();
 	/* Can't call mysql_server_end() multiple times prior to 5.0.42 on Windows */
 	if ((client_ver > 50042 && client_ver < 50100) || client_ver > 50122) {
 		mysql_server_end();

Modified: trunk/php6/ext/mysqli/mysqli.c
===================================================================
--- trunk/php6/ext/mysqli/mysqli.c	2007-09-11 11:15:32 UTC (rev 1011)
+++ trunk/php6/ext/mysqli/mysqli.c	2007-09-12 09:15:41 UTC (rev 1012)
@@ -796,7 +796,7 @@
 {
 #ifndef HAVE_MYSQLND
 #ifdef PHP_WIN32
-	unsigned long client_ver = mysql_get_client_version;
+	unsigned long client_ver = mysql_get_client_version();
 	/* Can't call mysql_server_end() multiple times prior to 5.0.42 on Windows */
 	if ((client_ver > 50042 && client_ver < 50100) || client_ver > 50122) {
 		mysql_server_end();

Modified: trunk/php6/ext/mysqli/php_mysqli_structs.h
===================================================================
--- trunk/php6/ext/mysqli/php_mysqli_structs.h	2007-09-11 11:15:32 UTC (rev 1011)
+++ trunk/php6/ext/mysqli/php_mysqli_structs.h	2007-09-12 09:15:41 UTC (rev 1012)
@@ -286,9 +286,10 @@
 #define MYSQLI_RETURN_LONG_LONG(__val) \
 { \
 	if ((__val) < LONG_MAX) {		\
-		RETURN_LONG((__val));		\
+		RETURN_LONG((long) (__val));		\
 	} else {				\
 		char *ret;			\
+		/* always used with my_ulonglong -> %llu */ \
 		int l = spprintf(&ret, 0, "%llu", (__val));	\
 		RETURN_STRINGL(ret, l, 0);		\
 	}					\