database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5

Browse Source 
due to GCC preprocessor change

Addendum for trunk: do not include system header when checking
the ABI.
This commit is contained in:
Davi Arnaut
2010-07-20 16:34:20 -03:00
parent 182599dd13
commit 70822d52ad
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mysql/plugin.h.pp
View File

@ -1,7 +1,5 @@
#include <mysql/services.h> #include <mysql/services.h>
#include <mysql/service_my_snprintf.h> #include <mysql/service_my_snprintf.h>
#include <stdarg.h>
#include <stdlib.h>
extern struct my_snprintf_service_st { extern struct my_snprintf_service_st {
size_t (*my_snprintf_type)(char*, size_t, const char*, ...); size_t (*my_snprintf_type)(char*, size_t, const char*, ...);
size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list);
@ -9,7 +7,6 @@ extern struct my_snprintf_service_st {
size_t my_snprintf(char* to, size_t n, const char* fmt, ...); 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); size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap);
#include <mysql/service_thd_alloc.h> #include <mysql/service_thd_alloc.h>
#include <stdlib.h>
struct st_mysql_lex_string struct st_mysql_lex_string
{ {
char *str; char *str;

3
include/mysql/service_my_snprintf.h
View File

@ -70,8 +70,11 @@
extern "C" { extern "C" {
#endif #endif
#ifndef MYSQL_ABI_CHECK
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#endif
extern struct my_snprintf_service_st { extern struct my_snprintf_service_st {
size_t (*my_snprintf_type)(char*, size_t, const char*, ...); size_t (*my_snprintf_type)(char*, size_t, const char*, ...);
size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list);

2
include/mysql/service_thd_alloc.h
View File

@ -27,7 +27,9 @@
allocations - they are better served with my_malloc. allocations - they are better served with my_malloc.
*/ */
#ifndef MYSQL_ABI_CHECK
#include <stdlib.h> #include <stdlib.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {