diff options
Diffstat (limited to 'source4/include/system')
| -rw-r--r-- | source4/include/system/filesys.h | 11 |
1 files changed, 11 insertions, 0 deletions
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 <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 |