summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authortim@threads.polyesthetic.msg <>2000-11-17 13:48:09 -0500
committertim@threads.polyesthetic.msg <>2000-11-17 13:48:09 -0500
commit03e19fc34c23b2626a850254c30800f67b134c88 (patch)
treef985df655f7e0e4693e7d9c52852d38b4da4fc49 /acinclude.m4
parent7344370353861f4a37eb23428ae2f210a2c59ff0 (diff)
downloadmariadb-git-03e19fc34c23b2626a850254c30800f67b134c88.tar.gz
acinclude.m4 undef inline during some C++ tests
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m410
1 files changed, 8 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index c8dab319c99..7f039dbf7af 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -41,14 +41,20 @@ then
CXXFLAGS="$CXXFLAGS -Werror"
fi
mysql_cv_btype_last_arg_accept=none
-[AC_TRY_COMPILE([#include <stdlib.h>
+[AC_TRY_COMPILE([#if defined(inline)
+#undef inline
+#endif
+#include <stdlib.h>
#include <sys/types.h>
#include <sys/socket.h>
],
[int a = accept(1, (struct sockaddr *) 0, (socklen_t *) 0); return (a != 0);],
mysql_cv_btype_last_arg_accept=socklen_t)]
if test $mysql_cv_btype_last_arg_accept = none; then
-[AC_TRY_COMPILE([#include <stdlib.h>
+[AC_TRY_COMPILE([#if defined(inline)
+#undef inline
+#endif
+#include <stdlib.h>
#include <sys/types.h>
#include <sys/socket.h>
],