$NetBSD: patch-ba,v 1.2 2008/09/07 04:35:41 dholland Exp $ --- src/EnginePl/machine.c.orig 2007-01-04 05:35:13.000000000 -0500 +++ src/EnginePl/machine.c 2008-09-07 00:07:29.000000000 -0400 @@ -469,7 +469,7 @@ SIGSEGV_Handler(int sig, struct sigconte static void SIGSEGV_Handler(int sig, siginfo_t * si) -#elif defined(M_ix86_bsd) || defined(M_powerpc_bsd) || defined(M_sparc_bsd) +#elif (defined(M_ix86_bsd) || defined(M_powerpc_bsd) || defined(M_sparc_bsd)) && !defined(__NetBSD__) static void SIGSEGV_Handler(int sig, int code, struct sigcontext *scp) @@ -482,7 +482,7 @@ SIGSEGV_Handler(WamWord *addr) void SIGSEGV_Handler(int sig, int code, struct sigcontext *scp) -#elif defined(M_x86_64_linux) +#elif defined(M_x86_64_linux) || defined(M_x86_64_bsd) void SIGSEGV_Handler(int sig, siginfo_t *sip, void *scp) @@ -509,7 +509,7 @@ SIGSEGV_Handler(int sig) WamWord *addr = (WamWord *) scp.cr2; -#elif defined(M_x86_64_linux) +#elif defined(M_x86_64_linux) || defined(M_x86_64_bsd) WamWord *addr = (WamWord *) sip->si_addr; @@ -517,7 +517,7 @@ SIGSEGV_Handler(int sig) WamWord *addr = (WamWord *) si->si_addr; -#elif defined(M_ix86_bsd) +#elif defined(M_ix86_bsd) && !defined(__NetBSD__) WamWord *addr = (WamWord *) scp->sc_err;