From f1fee7c557f3fed15d63c8cdb7e2e9703b984731 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Sat, 1 Aug 2015 11:51:39 -0700
Subject: [PATCH] buildworld - Fix bootstrapping from older worlds

* __returns_twice doesn't exist in older sys/cdefs.h, fix bootstrapping by
  shoehorning a default if it does not exist.
---
 include/setjmp.h | 4 ++++
 include/unistd.h | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/include/setjmp.h b/include/setjmp.h
index d0d72cf45e..77e8bc1b6c 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -46,6 +46,10 @@
 /* The size of the jmp_buf is machine dependent: */
 #include <machine/setjmp.h>
 
+#ifndef __returns_twice			/* help with buildworld bootstrap */
+#define __returns_twice
+#endif
+
 __BEGIN_DECLS
 int	setjmp (jmp_buf) __returns_twice;
 void	longjmp (jmp_buf, int) __dead2;
diff --git a/include/unistd.h b/include/unistd.h
index abfc359434..d73013b43a 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -42,6 +42,10 @@
 #include <sys/unistd.h>
 #include <sys/_null.h>
 
+#ifndef __returns_twice			/* help with buildworld bootstrap */
+#define __returns_twice
+#endif
+
 #ifndef _GID_T_DECLARED
 typedef	__gid_t		gid_t;
 #define	_GID_T_DECLARED
-- 
2.41.0