From: Ben Kaduk <kaduk@mit.edu>
Date: Tue, 26 Mar 2013 21:42:38 +0000 (-0400)
Subject: Fix DARWIN build with clang
X-Git-Tag: upstream/1.6.5.2^2~7
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=9d340e42dbcfb27b2987d55dfa332e1a2de7ce02;p=packages%2Fo%2Fopenafs.git

Fix DARWIN build with clang

In 1d8937b86050 we added a function call to kauth_cred_unref in the
DARWIN100 case (replacing a macro), but added the inclusion of
sys/kauth.h only when using versions older than DARWIN80.
On DARWIN100 and above, clang detects that the now-implicit function
declaration is in conflict with the actual prototype, which is included
later through afs/sysincludes.h when compiling the kernel rx code.

Since including sys/kauth.h seems to have been harmless for old versions,
just include it always.

Reviewed-on: http://gerrit.openafs.org/9676
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
(cherry picked from commit 6ad2cc0275cd1074316d6bc70cd8758d25f94467)

Reviewed-on: http://gerrit.openafs.org/10549
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
(cherry picked from commit e4b2242f3a29832e1df389ceea6ec4ca41c06306)

Change-Id: I5e3b28bbf513d47792dbf7808d6d88db6457ed33
Reviewed-on: http://gerrit.openafs.org/10608
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
Tested-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/afs/DARWIN/osi_machdep.h b/src/afs/DARWIN/osi_machdep.h
index ae6e02eb9..b0edbf9c2 100644
--- a/src/afs/DARWIN/osi_machdep.h
+++ b/src/afs/DARWIN/osi_machdep.h
@@ -33,8 +33,8 @@ typedef unsigned short etap_event_t;
 #include <sys/lock.h>
 #include <sys/user.h>
 #include <sys/vnode.h>
-#include <sys/kauth.h>
 #endif
+#include <sys/kauth.h>
 #include <kern/thread.h>
 
 #ifdef AFS_DARWIN80_ENV