PHP mysqlnd svn commit: r332 - in branches/qcache: mysqlnd php6/ext/mysqli

[ahristov]

Author: ahristov
Date: 2007-04-17 16:51:32 +0200 (Tue, 17 Apr 2007)
New Revision: 332

Modified:
   branches/qcache/mysqlnd/mysqlnd.c
   branches/qcache/mysqlnd/mysqlnd.h
   branches/qcache/php6/ext/mysqli/mysqli_mysqlnd.h
Log:
merge from trunk


Modified: branches/qcache/mysqlnd/mysqlnd.c
===================================================================
--- branches/qcache/mysqlnd/mysqlnd.c	2007-04-17 14:50:24 UTC (rev 331)
+++ branches/qcache/mysqlnd/mysqlnd.c	2007-04-17 14:51:32 UTC (rev 332)
@@ -2208,7 +2208,7 @@
 
 
 /* {{{ _mysqlnd_client_info */
-const char *_mysqlnd_get_client_info()
+PHPAPI const char *_mysqlnd_get_client_info()
 {
 	return MYSQLND_VERSION;
 }
@@ -2216,7 +2216,7 @@
 
 
 /* {{{ _mysqlnd_get_client_version */
-unsigned int _mysqlnd_get_client_version()
+PHPAPI unsigned int _mysqlnd_get_client_version()
 {
 	return MYSQLND_VERSION_ID;
 }

Modified: branches/qcache/mysqlnd/mysqlnd.h
===================================================================
--- branches/qcache/mysqlnd/mysqlnd.h	2007-04-17 14:50:24 UTC (rev 331)
+++ branches/qcache/mysqlnd/mysqlnd.h	2007-04-17 14:51:32 UTC (rev 332)
@@ -940,8 +940,8 @@
 #define
mysqlnd_fetch_field_direct(result,fnr)	(result)->m.fetch_field_direct((result), (fnr))
 
 /* mysqlnd metadata */
-const char *	_mysqlnd_get_client_info();
-unsigned int	_mysqlnd_get_client_version();
+PHPAPI const char *	_mysqlnd_get_client_info();
+PHPAPI unsigned int	_mysqlnd_get_client_version();
 #define mysqlnd_get_client_info			_mysqlnd_get_client_info
 #define mysqlnd_get_client_version		_mysqlnd_get_client_version
 

Modified: branches/qcache/php6/ext/mysqli/mysqli_mysqlnd.h
===================================================================
--- branches/qcache/php6/ext/mysqli/mysqli_mysqlnd.h	2007-04-17 14:50:24 UTC (rev 331)
+++ branches/qcache/php6/ext/mysqli/mysqli_mysqlnd.h	2007-04-17 14:51:32 UTC (rev 332)
@@ -99,8 +99,8 @@
 #define mysql_store_result(r)			mysqlnd_store_result((r))
 #define mysql_use_result(r)				mysqlnd_use_result((r))
 #define mysql_thread_id(r)				mysqlnd_thread_id((r))
-#define mysql_get_client_info()		MYSQLND_VERSION	
-#define mysql_get_client_version()		MYSQLND_VERSION_ID
+#define mysql_get_client_info()			mysqlnd_get_client_info()
+#define mysql_get_client_version()		mysqlnd_get_client_version()
 #define mysql_get_host_info(r)			mysqlnd_get_host_info((r))
 #define mysql_get_proto_info(r)			mysqlnd_get_proto_info((r))
 #define mysql_get_server_info(r)		mysqlnd_get_server_info((r))