STABLE12-sunos-support-cleanup-20020822

some things want ucontext.h. leave it there

(cherry picked from commit 76aa5ff2186ee28717a25b8d6947046ac14d8770)

diff --git a/acinclude.m4 b/acinclude.m4
index a44e4c6661aa21fdc89e0fe3713fbc6626e4b802..d1d7daf8ea8ccad7a7843a51444f940537db1bd7 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -484,7 +484,7 @@ AC_CHECK_HEADERS(netinet/in.h netdb.h sys/fcntl.h sys/mnttab.h sys/mntent.h)
 AC_CHECK_HEADERS(mntent.h sys/vfs.h sys/param.h sys/fs_types.h)
 AC_CHECK_HEADERS(sys/mount.h strings.h termios.h signal.h)
 AC_CHECK_HEADERS(windows.h malloc.h winsock2.h direct.h io.h)
-AC_CHECK_HEADERS(security/pam_modules.h siad.h usersec.h)
+AC_CHECK_HEADERS(security/pam_modules.h siad.h usersec.h ucontext.h)
 
 AC_CHECK_FUNCS(utimes random srandom getdtablesize snprintf re_comp re_exec)
 AC_CHECK_FUNCS(setprogname getprogname sigaction)

diff --git a/src/config/param.ia64_linux24.h b/src/config/param.ia64_linux24.h
index 63e5f45a84f40a1d1feeb587667cee8d83515bc5..58d31d9a8bb549103e707f0f0c3b1c7f87d5519d 100644 (file)
--- a/src/config/param.ia64_linux24.h
+++ b/src/config/param.ia64_linux24.h
@@ -75,6 +75,6 @@
 #endif
 #endif /* KERNEL */
 
-#define HAVE_UCONTEXT_H                /* should be in afsconfig.h */
+#define USE_UCONTEXT           /* should be in afsconfig.h */
 
 #endif /* _PARAM_IA64_LINUX20_H_ */

diff --git a/src/config/param.ia64_linux24_usr.h b/src/config/param.ia64_linux24_usr.h
index a15d41e0acbf3e394930dd00281ec5752452a51d..377971baf18bed00b3d026ef22e50656af1fa056 100644 (file)
--- a/src/config/param.ia64_linux24_usr.h
+++ b/src/config/param.ia64_linux24_usr.h
@@ -54,6 +54,6 @@
 #define CMSERVERPREF
 #endif
 
-#define HAVE_UCONTEXT_H                /* should be in afsconfig.h */
+#define USE_UCONTEXT           /* should be in afsconfig.h */
 
 #endif /* AFS_PARAM_H */

diff --git a/src/lwp/lwp.h b/src/lwp/lwp.h
index 4ae8096e700d4ce9fc2dfcceed374b05c9f89157..4e9c202a97825e2b4eea3057ed85df914c399772 100644 (file)
--- a/src/lwp/lwp.h
+++ b/src/lwp/lwp.h
@@ -20,7 +20,7 @@
 
 #if !defined(KERNEL) && !defined(_KMEMUSER) && !defined(AFS_PTHREAD_ENV)
 #include <afs/param.h>
-#ifdef HAVE_UCONTEXT_H
+#if defined(USE_UCONTEXT) && defined(HAVE_UCONTEXT_H)
 #include <ucontext.h>
 #else
 #include <setjmp.h>
@@ -195,7 +195,7 @@ typedef struct lwp_pcb {
 #else
 struct lwp_context {   /* saved context for dispatcher */
     char *topstack;    /* ptr to top of process stack */
-#ifdef HAVE_UCONTEXT_H
+#if defined(USE_UCONTEXT) && defined(HAVE_UCONTEXT_H)
     ucontext_t ucontext;
     int state;
 #else /* !HAVE_UCONTEXT_H */

diff --git a/src/lwp/preempt.c b/src/lwp/preempt.c
index 931573c1e14c0c0dfc2689e3118e8598333deb0a..b879ecf97226f6a7cd3384ca1862231bc3758458 100644 (file)
--- a/src/lwp/preempt.c
+++ b/src/lwp/preempt.c
@@ -24,6 +24,9 @@ int PRE_Block = 0;
 #else
 #include <sys/time.h>
 #include <signal.h>
+#ifdef HAVE_UCONTEXT_H
+#include <ucontext.h>
+#endif
 #include "lwp.h"
 #include "preempt.h"
 

diff --git a/src/lwp/process.c b/src/lwp/process.c
index b3a5317893ebd85f058b59e4db8a2d0af0dccc8e..5335e0e7c2f27231b8a952553f958562071f1155 100644 (file)
--- a/src/lwp/process.c
+++ b/src/lwp/process.c
@@ -27,7 +27,7 @@ extern int PRE_Block;              /* used in lwp.c and process.s */
 extern char PRE_Block;             /* used in lwp.c and process.s */
 #endif
 
-#ifdef HAVE_UCONTEXT_H
+#if defined(USE_UCONTEXT) && defined(HAVE_UCONTEXT_H)
 
 afs_int32
 savecontext(ep, savearea, newsp)