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/include/system/filesys.h | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'source4/include/system/filesys.h') 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