summaryrefslogtreecommitdiff
path: root/source4/build/m4/rewrite.m4
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2006-01-22 23:48:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:51:21 -0500
commit81a39f964e5efcbfb9242273e71703ca9151c679 (patch)
treede8eb2c04ead5e116690a4ee1f5478c04483ddda /source4/build/m4/rewrite.m4
parent818db3efd674f66a04c8616d5b6de9c5b89ba71a (diff)
downloadsamba-81a39f964e5efcbfb9242273e71703ca9151c679.tar.gz
samba-81a39f964e5efcbfb9242273e71703ca9151c679.tar.bz2
samba-81a39f964e5efcbfb9242273e71703ca9151c679.zip
r13071: Work around a really annoying compiler warning where header file
ordering causes MIN and MAX to be redefined. (This used to be commit 0eda8a31975fa6cf4f7026bccc5468fba957860d)
Diffstat (limited to 'source4/build/m4/rewrite.m4')
-rw-r--r--source4/build/m4/rewrite.m421
1 files changed, 21 insertions, 0 deletions
diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4
index 92bcdc0414..0bdd181a55 100644
--- a/source4/build/m4/rewrite.m4
+++ b/source4/build/m4/rewrite.m4
@@ -67,6 +67,27 @@ AC_CHECK_HEADERS(sys/mount.h, , , [AC_INCLUDES_DEFAULT
#include <sys/param.h>
#endif])
+AC_CACHE_CHECK([for MAX in sys/param.h], samba_cv_sys_param_h_max,
+ AC_TRY_COMPILE([
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif], [int i = MAX(1,2)],
+ samba_cv_sys_param_h_max=yes, samba_cv_sys_param_h_max=no) )
+
+if test x"$samba_cv_sys_param_h_max" = x"yes"; then
+ AC_DEFINE(HAVE_SYS_PARAM_H_MAX, 1, [Whether sys/param.h declares the MAX macro])
+fi
+
+AC_CACHE_CHECK([for MIN in sys/param.h], samba_cv_sys_param_h_min, [
+ AC_TRY_COMPILE([
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif], [int i = MIN(1,2)],
+ samba_cv_sys_param_h_min=yes, samba_cv_sys_param_h_min=no)] )
+
+if test x"$samba_cv_sys_param_h_min" = x"yes"; then
+ AC_DEFINE(HAVE_SYS_PARAM_H_MIN, 1, [Whether sys/param.h declares the MIN macro])
+fi
AC_TYPE_SIGNAL
AC_TYPE_UID_T