From: Marc Dionne <marc.c.dionne@gmail.com>
Date: Sun, 3 Jun 2012 00:45:08 +0000 (-0400)
Subject: afsd: include sys/resource.h in afsd_kernel.c
X-Git-Tag: upstream/1.8.0_pre1^2~2349
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=bc3a32a84facb8114a8c7de87025f972d0281098;p=packages%2Fo%2Fopenafs.git

afsd: include sys/resource.h in afsd_kernel.c

With a recent glibc update, sys/wait.h no longer includes
sys/resource.h unless __USE_SVID, __USE_XOPEN or __USE_XOPEN2K8
are set.

Don't rely on the indirect inclusion to get the bits we need;
include it directly in afsd_kernel.c.  This include used to be
there but was dropped when afsd_kernel.c was split off.

Change-Id: I1bfd2e0c340e15ca44472aa89614f088e0c0ce0c
Reviewed-on: http://gerrit.openafs.org/7522
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/afsd/afsd_kernel.c b/src/afsd/afsd_kernel.c
index d074cbf76..eeb42afb4 100644
--- a/src/afsd/afsd_kernel.c
+++ b/src/afsd/afsd_kernel.c
@@ -23,6 +23,10 @@
 #include <sys/file.h>
 #include <sys/wait.h>
 
+#if defined(AFS_LINUX20_ENV)
+#include <sys/resource.h>
+#endif
+
 #ifdef HAVE_SYS_FS_TYPES_H
 #include <sys/fs_types.h>
 #endif