sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

r13071: Work around a really annoying compiler warning where header file

Browse Source 
ordering causes MIN and MAX to be redefined.
This commit is contained in:
James Peach 2006-01-22 23:48:56 +00:00 committed by Gerald (Jerry) Carter
parent cbcce3b573
commit 0eda8a3197
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/build/m4/rewrite.m4
View File

@ -67,6 +67,27 @@ AC_CHECK_HEADERS(sys/mount.h, , , [AC_INCLUDES_DEFAULT
#include <sys/param.h> #include <sys/param.h>
#endif]) #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_SIGNAL
AC_TYPE_UID_T AC_TYPE_UID_T

11
source/include/system/filesys.h
View File

@ -24,6 +24,17 @@
#include <sys/stat.h> #include <sys/stat.h>
#ifdef HAVE_SYS_PARAM_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> #include <sys/param.h>
#endif #endif