From 4c54a04969d97570e2f423ca1935d995e353753b Mon Sep 17 00:00:00 2001 From: James Peach Date: Tue, 31 Jan 2006 01:51:31 +0000 Subject: r13248: Revert revision 13071. It turns out that sys/param.h can be implicitly included from other headers. In this case, undeffing MIN and MAX is a really bad idea because the subsequent include of sys/param.h will do nothing because of its include guards. (This used to be commit 8aa8be93b09cfbd176455738dfd305047030fd50) --- source4/build/m4/rewrite.m4 | 21 --------------------- source4/include/system/filesys.h | 11 ----------- 2 files changed, 32 deletions(-) diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4 index 0bdd181a55..92bcdc0414 100644 --- a/source4/build/m4/rewrite.m4 +++ b/source4/build/m4/rewrite.m4 @@ -67,27 +67,6 @@ AC_CHECK_HEADERS(sys/mount.h, , , [AC_INCLUDES_DEFAULT #include #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 -#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 -#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 diff --git a/source4/include/system/filesys.h b/source4/include/system/filesys.h index b79ec33c1a..e81eec13e9 100644 --- a/source4/include/system/filesys.h +++ b/source4/include/system/filesys.h @@ -24,17 +24,6 @@ #include #ifdef HAVE_SYS_PARAM_H -/* On (at least) IRIX and Linux, sys/param.h unconditionally defines the MAX - * and MIN macros. Since smb_macros.h might have already defined this, we - * choose to use the system versions if they are present. This avoids a MIPSPro - * compiler warning whenever this file is included. - */ -#if defined(HAVE_SYS_PARAM_H_MIN) && defined(MIN) -#undef MIN -#endif -#if defined(HAVE_SYS_PARAM_H_MAX) && defined(MAX) -#undef MAX -#endif #include #endif -- cgit