From: Derrick Brashear <shadow@your-file-system.com>
Date: Tue, 18 Sep 2012 03:26:12 +0000 (-0400)
Subject: afsd: roken.h includes dirent.h; get valid dirent defines on osx
X-Git-Tag: upstream/1.8.0_pre1^2~1986
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=43db9a73a2b34217b35c9d499bf685895a9e1390;p=packages%2Fo%2Fopenafs.git

afsd: roken.h includes dirent.h; get valid dirent defines on osx

our workaround for #define KERNEL didn't work on OSX because
roken.h included dirent.h before we got the chance. cope with
it.

Change-Id: I5e580aa934cec4e99d62ba105873f71b11326e2f
Reviewed-on: http://gerrit.openafs.org/8132
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Simon Wilkinson <simonxwilkinson@gmail.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
---

diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c
index 9050ef535..4fb075852 100644
--- a/src/afsd/afsd.c
+++ b/src/afsd/afsd.c
@@ -55,7 +55,15 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-#include <roken.h>
+/* darwin dirent.h doesn't give us the prototypes we want if KERNEL is
+ * defined, and roken includes dirent */
+#if defined(UKERNEL) && defined(AFS_USR_DARWIN_ENV)
+# undef KERNEL
+# include <roken.h>
+# define KERNEL
+#else
+# include <roken.h>
+#endif
 
 #define VFS 1