From: Derrick Brashear <shadow@dementia.org>
Date: Wed, 27 Sep 2006 22:15:59 +0000 (+0000)
Subject: DEVEL15-darwin90-ukernel-setjmp-conflict-20060927
X-Git-Tag: openafs-devel-1_5_9~51
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e45a85c7be69ae47e06d87f868be35c05104d766;p=packages%2Fo%2Fopenafs.git

DEVEL15-darwin90-ukernel-setjmp-conflict-20060927

FIXES 39354

setjmp isn't safe for #define KERNEL


(cherry picked from commit 4bfe736b9157fa3ee4c1c851e53d66b18e774827)
---

diff --git a/src/afs/UKERNEL/sysincludes.h b/src/afs/UKERNEL/sysincludes.h
index 54f078beb..2c851b0e2 100644
--- a/src/afs/UKERNEL/sysincludes.h
+++ b/src/afs/UKERNEL/sysincludes.h
@@ -21,7 +21,9 @@
 #include  <limits.h>
 #include  <assert.h>
 #include  <stdarg.h>
+#if !defined(AFS_USR_DARWIN_ENV) && !defined(AFS_USR_FBSD_ENV) /* must be included after KERNEL undef'd */
 #include <setjmp.h>
+#endif
 
 #ifdef AFS_USR_SUN5_ENV
 #include  <signal.h>
@@ -120,6 +122,7 @@
 #define AFS_USR_UNDEF_KERNEL_ENV 1
 #endif
 #include  <errno.h>
+#include  <setjmp.h>
 #include  <sys/param.h>
 #include  <sys/types.h>
 #include  <sys/socket.h>