From 04084d4e1d1b81f913c1e0c5b6655d6e84c29bae Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Thu, 21 Jul 2005 18:59:12 +0000
Subject: openbsd

---
 include/libc.h   | 2 +-
 include/u.h      | 2 --
 src/lib9/sleep.c | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/libc.h b/include/libc.h
index 3880f3d4..5c2e7bf1 100644
--- a/include/libc.h
+++ b/include/libc.h
@@ -832,7 +832,7 @@ extern	int	post9pservice(int, char*);
 #	endif
 #endif
 
-#if defined(__OpenBSD__) && !defined(NOPLAN9DEFINES)
+#if defined(__OpenBSD__)
 #define sched_yield() \
 	do { \
 		struct timespec ts; \
diff --git a/include/u.h b/include/u.h
index 0a696ceb..c5f5dcd0 100644
--- a/include/u.h
+++ b/include/u.h
@@ -95,11 +95,9 @@ typedef long p9jmp_buf[sizeof(sigjmp_buf)/sizeof(long)];
 #	undef _NEEDULONG
 #elif defined(__OpenBSD__)
 #	include <sys/types.h>
-#	include <pthread.h>
 #	undef _NEEDUSHORT
 #	undef _NEEDUINT
 #	undef _NEEDULONG
-#	define PLAN9PORT_USING_PTHREADS 1
 #else
 	/* No idea what system this is -- try some defaults */
 #	include <pthread.h>
diff --git a/src/lib9/sleep.c b/src/lib9/sleep.c
index 9cafdcf6..5da602eb 100644
--- a/src/lib9/sleep.c
+++ b/src/lib9/sleep.c
@@ -1,8 +1,8 @@
 #include <u.h>
 #define NOPLAN9DEFINES
-#include <libc.h>
 #include <sys/time.h>
 #include <sched.h>
+#include <libc.h>
 
 int
 p9sleep(long milli)
-- 
cgit v1.2.3