From 2e3a613788f1eef9e72b6cda77db1e8250ffc3c8 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Sun, 8 Nov 2015 18:10:14 +0000
Subject: Make sure we use a sigjmp_buf in the sigsetjmp() part of the test.

---
 src/regress/lib/libc/setjmp-fpu/_setjmp.c    | 3 ++-
 src/regress/lib/libc/setjmp-fpu/setjmp-fpu.c | 2 +-
 src/regress/lib/libc/setjmp-fpu/setjmp.c     | 3 ++-
 src/regress/lib/libc/setjmp-fpu/sigsetjmp.c  | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/regress/lib/libc/setjmp-fpu/_setjmp.c b/src/regress/lib/libc/setjmp-fpu/_setjmp.c
index 9131c7e0e8..a2195a5ff8 100644
--- a/src/regress/lib/libc/setjmp-fpu/_setjmp.c
+++ b/src/regress/lib/libc/setjmp-fpu/_setjmp.c
@@ -1,6 +1,7 @@
-/*	$OpenBSD: _setjmp.c,v 1.2 2015/01/20 04:41:01 krw Exp $	*/
+/*	$OpenBSD: _setjmp.c,v 1.3 2015/11/08 18:10:14 miod Exp $	*/
 #define	SETJMP(env, savemask)	_setjmp(env)
 #define	LONGJMP(env, val)	_longjmp(env, val)
 #define	TEST_SETJMP		test__setjmp
+#define	JMP_BUF			jmp_buf
 
 #include "setjmp-fpu.c"
diff --git a/src/regress/lib/libc/setjmp-fpu/setjmp-fpu.c b/src/regress/lib/libc/setjmp-fpu/setjmp-fpu.c
index 45b3c1ee0e..694061dcbb 100644
--- a/src/regress/lib/libc/setjmp-fpu/setjmp-fpu.c
+++ b/src/regress/lib/libc/setjmp-fpu/setjmp-fpu.c
@@ -4,7 +4,7 @@
 int
 TEST_SETJMP(int argc, char *argv[])
 {
-	jmp_buf env;
+	JMP_BUF env;
 	int rv;
 
 	/* Set up the FPU control word register. */
diff --git a/src/regress/lib/libc/setjmp-fpu/setjmp.c b/src/regress/lib/libc/setjmp-fpu/setjmp.c
index fe4acd1d2d..48d72056d0 100644
--- a/src/regress/lib/libc/setjmp-fpu/setjmp.c
+++ b/src/regress/lib/libc/setjmp-fpu/setjmp.c
@@ -1,6 +1,7 @@
-/*	$OpenBSD: setjmp.c,v 1.2 2015/01/20 04:41:01 krw Exp $	*/
+/*	$OpenBSD: setjmp.c,v 1.3 2015/11/08 18:10:14 miod Exp $	*/
 #define	SETJMP(env, savemask)	setjmp(env)
 #define	LONGJMP(env, val)	longjmp(env, val)
 #define	TEST_SETJMP		test_setjmp
+#define	JMP_BUF			jmp_buf
 
 #include "setjmp-fpu.c"
diff --git a/src/regress/lib/libc/setjmp-fpu/sigsetjmp.c b/src/regress/lib/libc/setjmp-fpu/sigsetjmp.c
index 6ce4cae37a..158fd83296 100644
--- a/src/regress/lib/libc/setjmp-fpu/sigsetjmp.c
+++ b/src/regress/lib/libc/setjmp-fpu/sigsetjmp.c
@@ -1,6 +1,7 @@
-/*	$OpenBSD: sigsetjmp.c,v 1.2 2015/01/20 04:41:01 krw Exp $	*/
+/*	$OpenBSD: sigsetjmp.c,v 1.3 2015/11/08 18:10:14 miod Exp $	*/
 #define	SETJMP(env, savemask)	sigsetjmp(env, savemask)
 #define	LONGJMP(env, val)	siglongjmp(env, val)
 #define	TEST_SETJMP		test_sigsetjmp
+#define	JMP_BUF			sigjmp_buf
 
 #include "setjmp-fpu.c"
-- 
cgit v1.2.3-55-g6feb