From 503568d5682a4681dfaaa65b268f914238dafdf6 Mon Sep 17 00:00:00 2001
From: Taylor R Campbell <campbell@mumble.net>
Date: Thu, 22 Jul 2010 19:51:14 +0000
Subject: [PATCH] Enable trap recovery on NetBSD.

Not really tested, but this triggers only when you're already
screwed, so enabling trap recovery probably won't make anything
worse.
---
 src/microcode/uxtrap.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/microcode/uxtrap.h b/src/microcode/uxtrap.h
index 052c2253f..05cc4fb8d 100644
--- a/src/microcode/uxtrap.h
+++ b/src/microcode/uxtrap.h
@@ -642,12 +642,12 @@ typedef struct
    reasonable guess.  */
 
 #if defined(__NetBSD__)
-
 #include <sys/param.h>
-
 #if defined(__NetBSD_Version__) && __NetBSD_Version__ >= 200000000
 
 #  define HAVE_SIGACTION_SIGINFO_SIGNALS
+#  define HAVE_SIGCONTEXT
+
 #  include <sys/siginfo.h>
 #  include <sys/ucontext.h>
 
@@ -655,7 +655,7 @@ typedef struct
 #    include <i386/mcontext.h>
 #    define SIGCONTEXT_NREGS _NGREG
 #    define __SIGCONTEXT_REG(scp, ir)           \
-  ((((scp) -> uc_mcontext) -> __gregs) [(ir)])
+  ((((scp) -> uc_mcontext) . __gregs) [(ir)])
 #    define SIGCONTEXT_FIRST_REG(scp) (& (__SIGCONTEXT_REG (scp, _REG_GS)))
 #    define SIGCONTEXT_RFREE(scp) (__SIGCONTEXT_REG (scp, _REG_EDI))
 #  endif
-- 
2.25.1