From bb33660672cc745b99d89242c9b2394fc1c8ade3 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 10 Dec 2005 15:00:35 +0000
Subject: [PATCH] Clean up the move of lwpProc (lwpint.h rev. 1.11, lwp.h rev.
 1.8).

---
 include/lwp.h        | 9 +++------
 src/lib/lwp/lwpint.h | 6 ++++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/include/lwp.h b/include/lwp.h
index 9c89414d..14134cc9 100644
--- a/include/lwp.h
+++ b/include/lwp.h
@@ -20,15 +20,12 @@
  * Imperial College of Science, Technology and Medicine, 180 Queen's
  * Gate, London SW7 2BZ, England.
  */
+
 #ifndef _LWP_H_
 #define _LWP_H_
-#ifdef UCONTEXT
-#include <ucontext.h>
-#else  /* !UCONTEXT */
-#include <setjmp.h>
-#endif /* !UCONTEXT */
-#include <sys/time.h>
+
 #include "misc.h"
+
 #define LWP_STACKCHECK	0x1
 #define LWP_PRINT	0x2
 
diff --git a/src/lib/lwp/lwpint.h b/src/lib/lwp/lwpint.h
index 06d0504f..c6c0053a 100644
--- a/src/lib/lwp/lwpint.h
+++ b/src/lib/lwp/lwpint.h
@@ -24,6 +24,12 @@
 #ifndef _LWPINT_H
 #define _LWPINT_H
 
+#ifdef UCONTEXT
+#include <ucontext.h>
+#else  /* !UCONTEXT */
+#include <setjmp.h>
+#endif /* !UCONTEXT */
+
 /* `liveness' counter: check signals every `n' visits to the scheduler */
 /* note: the lower this value, the more responsive the system but the */
 /* more inefficient the context switch time */