From b4c4eb607eff3730c40c25f30efb79c6a064c305 Mon Sep 17 00:00:00 2001
From: leitner <leitner>
Date: Tue, 11 Oct 2016 11:45:46 +0000
Subject: [PATCH]   remove OpenBSD #warning (obsd maintainer says no longer
 needed)

---
 CHANGES           | 1 +
 io/io_passfd.c    | 7 -------
 io/io_readfile.3  | 2 +-
 io/io_receivefd.c | 7 -------
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/CHANGES b/CHANGES
index 933e383..e6d8d39 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 0.32:
+  remove OpenBSD #warning (obsd maintainer says no longer needed)
 
 0.31:
   special case buffer_get_token with token length 1 through memccpy (almost 4x speedup)
diff --git a/io/io_passfd.c b/io/io_passfd.c
index 2de23a6..b29d207 100644
--- a/io/io_passfd.c
+++ b/io/io_passfd.c
@@ -11,15 +11,8 @@ int io_passfd(int64 sock,int64 fd) {
 #define _NETBSD_SOURCE
 #endif
 
-#ifdef __OpenBSD__
-#warning This is a HORRIBLE kludge around yet another thing OpenBSD broke
-#warning If they make it possible to do file descriptor passing with
-#warning _XOPEN_SOURCE defined, please send me an email so I can remove this.
-#warning _XOPEN_SOURCE needs to be defined for this to work on Solaris.
-#else
 #define _XOPEN_SOURCE
 #define _XOPEN_SOURCE_EXTENDED 1
-#endif
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/io/io_readfile.3 b/io/io_readfile.3
index a858a9f..7ddf314 100644
--- a/io/io_readfile.3
+++ b/io/io_readfile.3
@@ -12,4 +12,4 @@ disk file named \fIs\fR, and returns 1.
 If something goes wrong, io_readfile sets \fIerrno\fR to indicate the error, and
 returns 0; it does not create a new descriptor, and it does not touch d.
 .SH "SEE ALSO"
-io_createfilefile(3), io_appendfile(3), io_readwritefile(3)
+io_createfile(3), io_appendfile(3), io_readwritefile(3)
diff --git a/io/io_receivefd.c b/io/io_receivefd.c
index 73cdcf7..febf6e0 100644
--- a/io/io_receivefd.c
+++ b/io/io_receivefd.c
@@ -11,15 +11,8 @@ int64 io_receivefd(int64 sock) {
 #define _NETBSD_SOURCE
 #endif
 
-#ifdef __OpenBSD__
-#warning This is a HORRIBLE kludge around yet another thing OpenBSD broke
-#warning If they make it possible to do file descriptor passing with
-#warning _XOPEN_SOURCE defined, please send me an email so I can remove this.
-#warning _XOPEN_SOURCE needs to be defined for this to work on Solaris.
-#else
 #define _XOPEN_SOURCE
 #define _XOPEN_SOURCE_EXTENDED 1
-#endif
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/socket.h>