summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2006-01-31 01:51:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:51:38 -0500
commit4c54a04969d97570e2f423ca1935d995e353753b (patch)
treef6f59a1b584de406a5939041ee2efa18e37c67f2
parent7c7125be5dfdbacd702891e16529eb1412966f83 (diff)
downloadsamba-4c54a04969d97570e2f423ca1935d995e353753b.tar.gz
samba-4c54a04969d97570e2f423ca1935d995e353753b.tar.bz2
samba-4c54a04969d97570e2f423ca1935d995e353753b.zip
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)
-rw-r--r--source4/build/m4/rewrite.m421
-rw-r--r--source4/include/system/filesys.h11
2 files changed, 0 insertions, 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 <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
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 <sys/stat.h>
#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 <sys/param.h>
#endif