From fe2bae1c83a6d050e0afb88bad8fe02beae343e7 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Thu, 3 Jan 2013 13:57:02 -0800 Subject: [PATCH] Ensure MIN/MAX are defined in userspace builds of rx The include of was removed from rx_packet.h on Linux 2.6 and later to fix kernel builds with 3.7, which doesn't have that header in kernel space. However, while kernel space always provides MIN/MAX defines, userspace relied on the header. On at least powerpc, no other include chain includes sys/param.h, so MIN/MAX were left undefined. Fix this by only skipping the include of on Linux if building in kernel mode. Change-Id: Icd2edd645ef4d18d626de8ce8b81ac07f37b1f21 Reviewed-on: http://gerrit.openafs.org/8870 Reviewed-by: Andrew Deason Reviewed-by: Jeffrey Altman Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/rx/rx_packet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rx/rx_packet.h b/src/rx/rx_packet.h index b7cc508..f783472 100644 --- a/src/rx/rx_packet.h +++ b/src/rx/rx_packet.h @@ -43,7 +43,7 @@ #if !defined(AFS_DARWIN_ENV) && !defined(AFS_USR_DARWIN_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_USR_FBSD_ENV) && !defined(AFS_USR_DFBSD_ENV) && !defined(AFS_LINUX20_ENV) #include /* MIN, MAX on Solaris */ #endif -#if !defined(AFS_LINUX26_ENV) +#if !(defined(AFS_LINUX26_ENV) && defined(KERNEL)) #include /* MIN, MAX elsewhere */ #endif #endif /* AFS_NT40_ENV */ -- 1.9.4