From 81a39f964e5efcbfb9242273e71703ca9151c679 Mon Sep 17 00:00:00 2001 From: James Peach Date: Sun, 22 Jan 2006 23:48:56 +0000 Subject: 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) --- source4/include/system/filesys.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'source4/include') diff --git a/source4/include/system/filesys.h b/source4/include/system/filesys.h index e81eec13e9..b79ec33c1a 100644 --- a/source4/include/system/filesys.h +++ b/source4/include/system/filesys.h @@ -24,6 +24,17 @@ #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