From bdda6fc3cbfb4e676d510de75e8ab41cb4c39d2a Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Thu, 20 Mar 2008 12:10:43 -0500
Subject: [PATCH] make openbsd compile with NO_UI=1

---
 vm/Config.openbsd      | 1 +
 vm/os-openbsd-x86.32.h | 7 +++++--
 vm/os-openbsd.h        | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/vm/Config.openbsd b/vm/Config.openbsd
index 61534d4e66..8724ebf378 100644
--- a/vm/Config.openbsd
+++ b/vm/Config.openbsd
@@ -1,4 +1,5 @@
 include vm/Config.unix
 PLAF_DLL_OBJS += vm/os-genunix.o vm/os-openbsd.o
+CC = egcc
 CFLAGS += -export-dynamic
 LIBS = -L/usr/local/lib/ -lm $(X11_UI_LIBS)
diff --git a/vm/os-openbsd-x86.32.h b/vm/os-openbsd-x86.32.h
index 7e1e4894c2..0617e62c0d 100644
--- a/vm/os-openbsd-x86.32.h
+++ b/vm/os-openbsd-x86.32.h
@@ -1,7 +1,10 @@
+#include <i386/signal.h>
+
 INLINE void *openbsd_stack_pointer(void *uap)
 {
-	ucontext_t *ucontext = (ucontext_t *)uap;
-	return (void *)ucontext->sc_esp;
+	struct sigcontext *sc = (struct sigcontext*) uap;
+	return (void *)sc->sc_esp;
 }
 
 #define ucontext_stack_pointer openbsd_stack_pointer
+#define UAP_PROGRAM_COUNTER(uap) (((struct sigcontext*)(uap))->sc_eip)
diff --git a/vm/os-openbsd.h b/vm/os-openbsd.h
index af47f7bcea..21e34c98f8 100644
--- a/vm/os-openbsd.h
+++ b/vm/os-openbsd.h
@@ -1,2 +1,6 @@
 #define UNKNOWN_TYPE_P(file) ((file)->d_type == DT_UNKNOWN)
 #define DIRECTORY_P(file) ((file)->d_type == DT_DIR)
+
+#ifndef environ
+	extern char **environ;
+#endif