Fix MIN/MAX definition in userspace on powerpc

* Restore include of <sys/param.h> in userspace builds of rx/rx_packet.h
  to get a definition of MIN and MAX on, at least, powerpc.  Thanks,
  Andrew Deason.

diff --git a/debian/changelog b/debian/changelog
index 65bfefb0ae2ec7ada6d791ee1af0f2671a5489a7..5343626b4780e7aa03971fc7634ea02b0e9d5add 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openafs (1.6.2~pre2-2) experimental; urgency=low
+
+  * Restore include of <sys/param.h> in userspace builds of rx/rx_packet.h
+    to get a definition of MIN and MAX on, at least, powerpc.  Thanks,
+    Andrew Deason.
+
+ -- Russ Allbery <rra@debian.org>  Thu, 03 Jan 2013 12:06:41 -0800
+
 openafs (1.6.2~pre2-1) experimental; urgency=low
 
   * New upstream prerelease.

diff --git a/src/rx/rx_packet.h b/src/rx/rx_packet.h
index df9d9f4168a1cfc8224c68b6b328d2f29a37d473..334f47783ce5dfe7a02b583d668f87f57555b844 100644 (file)
--- 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 */