From 6a278b1af0929d4b79e62ba3391c1964f6c30e51 Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel@minix3.org>
Date: Sun, 18 Jun 2017 20:11:22 +0000
Subject: [PATCH] Remove disabling of the reentrant macros

---
 lib/libc/include/reentrant.h | 22 ----------------------
 sys/sys/featuretest.h        |  2 --
 2 files changed, 24 deletions(-)

diff --git a/lib/libc/include/reentrant.h b/lib/libc/include/reentrant.h
index 55be7f022..0850a49af 100644
--- a/lib/libc/include/reentrant.h
+++ b/lib/libc/include/reentrant.h
@@ -84,15 +84,6 @@
  *
  */
 
-#if !defined(__minix) || !defined(_LIBC_REENTRANT_H)
-#ifdef __minix
-/*
- * If _REENTRANT is not defined, the header may not be included more than once.
- * This is probably a NetBSD libc bug, but for now we solve it for MINIX3 only.
- */
-#define _LIBC_REENTRANT_H
-#endif /* __minix */
-
 /*
  * Abstract thread interface for thread-safe libraries.  These routines
  * will use stubs in libc if the application is not linked against the
@@ -100,8 +91,6 @@
  * is.
  */
 
-#ifndef __minix
-
 #include <pthread.h>
 #include <signal.h>
 
@@ -133,15 +122,6 @@
 #define	once_t			pthread_once_t
 #define	ONCE_INITIALIZER	PTHREAD_ONCE_INIT
 
-#else /* __minix */
-
-typedef struct {
-	int pto_done;
-} once_t;
-#define ONCE_INITIALIZER	{ .pto_done = 0 }
-
-#endif /* __minix */
-
 #ifdef _REENTRANT
 
 #ifndef __LIBC_THREAD_STUBS
@@ -349,5 +329,3 @@ thr_once(once_t *once_control, void (*routine)(void))
 #define	FUNLOCKFILE(fp) __empty
 
 #endif /* _REENTRANT */
-
-#endif /* !defined(__minix) || !defined(_LIBC_REENTRANT_H) */
diff --git a/sys/sys/featuretest.h b/sys/sys/featuretest.h
index 9c2cb7047..4002bb02e 100644
--- a/sys/sys/featuretest.h
+++ b/sys/sys/featuretest.h
@@ -77,9 +77,7 @@
 #endif /* defined(__minix) */
 
 /* Never define _REENTRANT on Minix */
-#if !defined(__minix)
 #if ((_POSIX_C_SOURCE - 0) >= 199506L || (_XOPEN_SOURCE - 0) >= 500) && \
     !defined(_REENTRANT)
 #define _REENTRANT
-#endif /* !defined(__minix) */
 #endif