[Commits] Rev 2871: fixes for gcc 4.5 in http://bazaar.launchpad.net/~maria-captains/maria/5.2/

serg at askmonty.org serg at askmonty.org
Tue Sep 28 21:31:01 EEST 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.2/

------------------------------------------------------------
revno: 2871
revision-id: sergii at pisem.net-20100928164723-o9bnypxha25n48dh
parent: monty at askmonty.org-20100927221806-u9ycav5l0x00s1uv
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.2
timestamp: Tue 2010-09-28 18:47:23 +0200
message:
  fixes for gcc 4.5
-------------- next part --------------
=== modified file 'include/mysql/client_plugin.h'
--- a/include/mysql/client_plugin.h	2010-03-29 15:13:53 +0000
+++ b/include/mysql/client_plugin.h	2010-09-28 16:47:23 +0000
@@ -23,8 +23,10 @@
 */
 #define MYSQL_CLIENT_PLUGIN_INCLUDED
 
+#ifndef MYSQL_ABI_CHECK
 #include <stdarg.h>
 #include <stdlib.h>
+#endif
 
 /* known plugin types */
 #define MYSQL_CLIENT_reserved1               0

=== modified file 'include/mysql/client_plugin.h.pp'
--- a/include/mysql/client_plugin.h.pp	2010-03-29 15:13:53 +0000
+++ b/include/mysql/client_plugin.h.pp	2010-09-28 16:47:23 +0000
@@ -1,5 +1,3 @@
-#include <stdarg.h>
-#include <stdlib.h>
 struct st_mysql_client_plugin
 {
   int type; unsigned int interface_version; const char *name; const char *author; const char *desc; unsigned int version[3]; int (*init)(char *, size_t, int, va_list); int (*deinit)();

=== modified file 'include/mysql/plugin_auth.h.pp'
--- a/include/mysql/plugin_auth.h.pp	2010-06-15 19:12:13 +0000
+++ b/include/mysql/plugin_auth.h.pp	2010-09-28 16:47:23 +0000
@@ -1,8 +1,6 @@
 #include <mysql/plugin.h>
 #include <mysql/services.h>
 #include <mysql/service_my_snprintf.h>
-#include <stdarg.h>
-#include <stdlib.h>
 extern struct my_snprintf_service_st {
   size_t (*my_snprintf_type)(char*, size_t, const char*, ...);
   size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list);
@@ -10,7 +8,6 @@ extern struct my_snprintf_service_st {
 size_t my_snprintf(char* to, size_t n, const char* fmt, ...);
 size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap);
 #include <mysql/service_thd_alloc.h>
-#include <stdlib.h>
 struct st_mysql_lex_string
 {
   char *str;

=== modified file 'include/mysql/service_my_snprintf.h'
--- a/include/mysql/service_my_snprintf.h	2010-03-03 14:44:14 +0000
+++ b/include/mysql/service_my_snprintf.h	2010-09-28 16:47:23 +0000
@@ -70,8 +70,10 @@
 extern "C" {
 #endif
 
+#ifndef MYSQL_ABI_CHECK
 #include <stdarg.h>
 #include <stdlib.h>
+#endif
 extern struct my_snprintf_service_st {
   size_t (*my_snprintf_type)(char*, size_t, const char*, ...);
   size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list);

=== modified file 'include/mysql/service_thd_alloc.h'
--- a/include/mysql/service_thd_alloc.h	2010-03-03 14:44:14 +0000
+++ b/include/mysql/service_thd_alloc.h	2010-09-28 16:47:23 +0000
@@ -27,7 +27,9 @@
   allocations - they are better served with my_malloc.
 */
 
+#ifndef MYSQL_ABI_CHECK
 #include <stdlib.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {



More information about the commits mailing list