From: Russ Allbery <rra@stanford.edu>
Date: Thu, 3 Jan 2013 21:57:02 +0000 (-0800)
Subject: Ensure MIN/MAX are defined in userspace builds of rx
X-Git-Tag: upstream/1.6.2_pre3^2~5
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=39dc50198e2cf61295e452d52536135a941d73d8;p=packages%2Fo%2Fopenafs.git

Ensure MIN/MAX are defined in userspace builds of rx

The include of <sys/param.h> 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 <sys/param.h> on Linux
if building in kernel mode.

Reviewed-on: http://gerrit.openafs.org/8870
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
(cherry picked from commit fe2bae1c83a6d050e0afb88bad8fe02beae343e7)

Change-Id: I4b2b123c493ab35cbeff309db7ff58354afc170b
Reviewed-on: http://gerrit.openafs.org/8872
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Paul Smeddle <paul.smeddle@gmail.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/rx/rx_packet.h b/src/rx/rx_packet.h
index df9d9f416..334f47783 100644
--- a/src/rx/rx_packet.h
+++ b/src/rx/rx_packet.h
@@ -42,7 +42,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 <sys/sysmacros.h>	/* MIN, MAX on Solaris */
 #endif
-#if !defined(AFS_LINUX26_ENV)
+#if !(defined(AFS_LINUX26_ENV) && defined(KERNEL))
 #include <sys/param.h>		/* MIN, MAX elsewhere */
 #endif
 #endif /* AFS_NT40_ENV */