diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 14:54:05 -0300 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 14:54:05 -0300 |
| commit | 508d060d628076d6f0e0a64cdaf566bf86c8a5bb (patch) | |
| tree | 9d3e26ddf1416e0c0e16aa363db92f66511437f2 | |
| parent | 182d1dd875ec067b9ab04b99ac31dad5235c6223 (diff) | |
| parent | c36fee08f6fa7974324438572a260101335cb4b4 (diff) | |
| download | mariadb-git-508d060d628076d6f0e0a64cdaf566bf86c8a5bb.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | include/mysql.h | 2 | ||||
| -rw-r--r-- | include/mysql.h.pp | 1 |
4 files changed, 4 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 297e923905e..9a9a53ebd16 100644 --- a/Makefile.am +++ b/Makefile.am @@ -312,7 +312,7 @@ abi_check_all: abi_check do_abi_check: set -ex; \ for file in $(abi_headers); do \ - @CC@ -E -nostdinc -dI \ + @CC@ -E -nostdinc -dI -DMYSQL_ABI_CHECK \ -I$(top_srcdir)/include \ -I$(top_srcdir)/include/mysql \ -I$(top_srcdir)/sql \ diff --git a/configure.in b/configure.in index a2f0c432681..97597e2a8b9 100644 --- a/configure.in +++ b/configure.in @@ -463,16 +463,7 @@ if test "$GCC" != "yes" || expr "$CC" : ".*icc.*" then ABI_CHECK="" else - # Workaround GCC >= 4.5 - See Bug#52514 - case `$CC -dumpversion` in - [[4-9]].[[5-9]]*) - AC_MSG_WARN([ABI check disabled (GCC >= 4.5)]) - ABI_CHECK="" - ;; - *) - ABI_CHECK="abi_check" - ;; - esac + ABI_CHECK="abi_check" fi AC_SUBST(ABI_CHECK) diff --git a/include/mysql.h b/include/mysql.h index 7eef91cf55a..dc6e4eb19a6 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -44,7 +44,9 @@ extern "C" { #endif #ifndef _global_h /* If not standard header */ +#ifndef MYSQL_ABI_CHECK #include <sys/types.h> +#endif #ifdef __LCC__ #include <winsock2.h> /* For windows */ #endif diff --git a/include/mysql.h.pp b/include/mysql.h.pp index bc5d611ec84..531062aee80 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -1,4 +1,3 @@ -#include <sys/types.h> typedef char my_bool; typedef int my_socket; #include "mysql_version.h" |