diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-09-28 18:47:23 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-09-28 18:47:23 +0200 |
| commit | 7d66e48d129ea46ace7c0d5dd67e39b3bae749ba (patch) | |
| tree | 8e50c0b4156bf721477ad77fefb645a606f5374a | |
| parent | ca672e6b61d8e8f4d1c092a1f8a9c0e4f3f19027 (diff) | |
| download | mariadb-git-7d66e48d129ea46ace7c0d5dd67e39b3bae749ba.tar.gz | |
fixes for gcc 4.5
| -rw-r--r-- | include/mysql/client_plugin.h | 2 | ||||
| -rw-r--r-- | include/mysql/client_plugin.h.pp | 2 | ||||
| -rw-r--r-- | include/mysql/plugin_auth.h.pp | 3 | ||||
| -rw-r--r-- | include/mysql/service_my_snprintf.h | 2 | ||||
| -rw-r--r-- | include/mysql/service_thd_alloc.h | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/include/mysql/client_plugin.h b/include/mysql/client_plugin.h index 5e9a337dfc6..9c7b1aee9f9 100644 --- a/include/mysql/client_plugin.h +++ b/include/mysql/client_plugin.h @@ -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 diff --git a/include/mysql/client_plugin.h.pp b/include/mysql/client_plugin.h.pp index 20d353422dd..ca477d83bb2 100644 --- a/include/mysql/client_plugin.h.pp +++ b/include/mysql/client_plugin.h.pp @@ -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)(); diff --git a/include/mysql/plugin_auth.h.pp b/include/mysql/plugin_auth.h.pp index 977c87493a4..b0d5daf4c64 100644 --- a/include/mysql/plugin_auth.h.pp +++ b/include/mysql/plugin_auth.h.pp @@ -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; diff --git a/include/mysql/service_my_snprintf.h b/include/mysql/service_my_snprintf.h index ad344864c34..30e95e20a5a 100644 --- a/include/mysql/service_my_snprintf.h +++ b/include/mysql/service_my_snprintf.h @@ -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); diff --git a/include/mysql/service_thd_alloc.h b/include/mysql/service_thd_alloc.h index 86158ba1359..7061c2bd4d5 100644 --- a/include/mysql/service_thd_alloc.h +++ b/include/mysql/service_thd_alloc.h @@ -27,7 +27,9 @@ allocations - they are better served with my_malloc. */ +#ifndef MYSQL_ABI_CHECK #include <stdlib.h> +#endif #ifdef __cplusplus extern "C" { |