From 70822d52ada9a81542b799dd238bf9db4771f7c4 Mon Sep 17 00:00:00 2001
From: Davi Arnaut <davi.arnaut@oracle.com>
Date: Tue, 20 Jul 2010 16:34:20 -0300
Subject: [PATCH] Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5 
           due to GCC preprocessor change

Addendum for trunk: do not include system header when checking
the ABI.
---
 include/mysql/plugin.h.pp           | 3 ---
 include/mysql/service_my_snprintf.h | 3 +++
 include/mysql/service_thd_alloc.h   | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/mysql/plugin.h.pp b/include/mysql/plugin.h.pp
index 3a1b03742da..ce9902ee418 100644
--- a/include/mysql/plugin.h.pp
+++ b/include/mysql/plugin.h.pp
@@ -1,7 +1,5 @@
 #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);
@@ -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_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 9e5fe7f9c9f..d7f8d07e110 100644
--- a/include/mysql/service_my_snprintf.h
+++ b/include/mysql/service_my_snprintf.h
@@ -70,8 +70,11 @@
 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" {