From 9ee2448c5449d2d13579500b75779ccd872fa968 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Thu, 3 Jan 2013 12:07:41 -0800 Subject: [PATCH] Fix MIN/MAX definition in userspace on powerpc * Restore include of in userspace builds of rx/rx_packet.h to get a definition of MIN and MAX on, at least, powerpc. Thanks, Andrew Deason. --- debian/changelog | 8 ++++++++ src/rx/rx_packet.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 65bfefb0a..5343626b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +openafs (1.6.2~pre2-2) experimental; urgency=low + + * Restore include of 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 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 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 /* 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 */ -- 2.39.5