From d44819ae9c55f4d3c0f347b2640f58a2deddebb4 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 22 Jul 2019 13:58:11 +0000
Subject:  Factor all the BSD complaints into one new header

---
 src/libstddjb/cdb_init_map.c           |  5 +----
 src/libstddjb/error_isalready.c        | 14 ++++++++++++++
 src/libstddjb/iopause_ppoll.c          | 11 +----------
 src/libstddjb/iopause_select.c         |  6 +-----
 src/libstddjb/localtm_from_ltm64.c     |  6 +-----
 src/libstddjb/tai_u64.c                |  6 +-----
 src/libstddjb/time_from_tai.c          |  6 +-----
 src/libstddjb/time_from_tai_relative.c |  6 +-----
 src/libstddjb/time_sysclock_from_tai.c |  6 +-----
 9 files changed, 22 insertions(+), 44 deletions(-)
 create mode 100644 src/libstddjb/error_isalready.c

(limited to 'src/libstddjb')

diff --git a/src/libstddjb/cdb_init_map.c b/src/libstddjb/cdb_init_map.c
index 9851faa..55fb02a 100644
--- a/src/libstddjb/cdb_init_map.c
+++ b/src/libstddjb/cdb_init_map.c
@@ -1,9 +1,6 @@
 /* ISC license. */
 
-#ifndef _BSD_SOURCE
-#define _BSD_SOURCE
-#endif
-
+#include <skalibs/bsdsnowflake.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <stdint.h>
diff --git a/src/libstddjb/error_isalready.c b/src/libstddjb/error_isalready.c
new file mode 100644
index 0000000..db63932
--- /dev/null
+++ b/src/libstddjb/error_isalready.c
@@ -0,0 +1,14 @@
+/* ISC license. */
+
+#include <skalibs/bsdsnowflake.h>
+#include <errno.h>
+#include <skalibs/error.h>
+
+int error_isalready (int e)
+{
+  return e == EALREADY || e == EINPROGRESS
+#ifdef SKALIBS_BSD_SUCKS
+   || e == ADDRINUSE
+#endif
+  ;
+}
diff --git a/src/libstddjb/iopause_ppoll.c b/src/libstddjb/iopause_ppoll.c
index 960a464..0c571e1 100644
--- a/src/libstddjb/iopause_ppoll.c
+++ b/src/libstddjb/iopause_ppoll.c
@@ -4,16 +4,7 @@
 
 #ifdef SKALIBS_HASPPOLL
 
-/* Just in case OpenBSD implements ppoll before fixing EOVERFLOW.
-   Stranger things have happened in the wonderful world of OpenBSD. */
-#ifndef _BSD_SOURCE
-#define _BSD_SOURCE
-#endif
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
+#include <skalibs/nonposix.h>
 #include <errno.h>
 #include <time.h>
 #include <poll.h>
diff --git a/src/libstddjb/iopause_select.c b/src/libstddjb/iopause_select.c
index b6bdd2d..8b8479b 100644
--- a/src/libstddjb/iopause_select.c
+++ b/src/libstddjb/iopause_select.c
@@ -1,10 +1,6 @@
 /* ISC license. */
 
-/* OpenBSD needs that for EOVERFLOW. wtfbsdseriously */
-#ifndef _BSD_SOURCE
-#define _BSD_SOURCE
-#endif
-
+#include <skalibs/bsdsnowflake.h>
 #include <string.h>  /* Solaris... */
 #include <errno.h>
 #include <sys/select.h>
diff --git a/src/libstddjb/localtm_from_ltm64.c b/src/libstddjb/localtm_from_ltm64.c
index 8eba409..74d2fb3 100644
--- a/src/libstddjb/localtm_from_ltm64.c
+++ b/src/libstddjb/localtm_from_ltm64.c
@@ -1,11 +1,7 @@
 /* ISC license. */
 
-/* OpenBSD needs that for EOVERFLOW. wtfbsdseriously */
-#ifndef _BSD_SOURCE
-#define _BSD_SOURCE
-#endif
-
 #include <skalibs/sysdeps.h>
+#include <skalibs/bsdsnowflake.h>
 #include <errno.h>
 #include <time.h>
 #include <skalibs/uint64.h>
diff --git a/src/libstddjb/tai_u64.c b/src/libstddjb/tai_u64.c
index 624f2cb..1d7eabe 100644
--- a/src/libstddjb/tai_u64.c
+++ b/src/libstddjb/tai_u64.c
@@ -1,10 +1,6 @@
 /* ISC license. */
 
-/* OpenBSD needs that for EOVERFLOW. wtfbsdseriously */
-#ifndef _BSD_SOURCE
-#define _BSD_SOURCE
-#endif
-
+#include <skalibs/bsdsnowflake.h>
 #include <errno.h>
 #include <skalibs/uint64.h>
 #include <skalibs/tai.h>
diff --git a/src/libstddjb/time_from_tai.c b/src/libstddjb/time_from_tai.c
index 1f4ff2a..f3f9538 100644
--- a/src/libstddjb/time_from_tai.c
+++ b/src/libstddjb/time_from_tai.c
@@ -1,11 +1,7 @@
  /* ISC license. */
 
-/* OpenBSD needs that for EOVERFLOW. wtfbsdseriously */
-#ifndef _BSD_SOURCE
-#define _BSD_SOURCE
-#endif
-
 #include <skalibs/sysdeps.h>
+#include <skalibs/bsdsnowflake.h>
 #include <time.h>
 #include <errno.h>
 #include <skalibs/uint64.h>
diff --git a/src/libstddjb/time_from_tai_relative.c b/src/libstddjb/time_from_tai_relative.c
index 1d11e2e..598d80b 100644
--- a/src/libstddjb/time_from_tai_relative.c
+++ b/src/libstddjb/time_from_tai_relative.c
@@ -1,11 +1,7 @@
  /* ISC license. */
 
-/* OpenBSD needs that for EOVERFLOW. wtfbsdseriously */
-#ifndef _BSD_SOURCE
-#define _BSD_SOURCE
-#endif
-
 #include <skalibs/sysdeps.h>
+#include <skalibs/bsdsnowflake.h>
 #include <time.h>
 #include <errno.h>
 #include <skalibs/tai.h>
diff --git a/src/libstddjb/time_sysclock_from_tai.c b/src/libstddjb/time_sysclock_from_tai.c
index 3e8322b..b0fd689 100644
--- a/src/libstddjb/time_sysclock_from_tai.c
+++ b/src/libstddjb/time_sysclock_from_tai.c
@@ -1,11 +1,7 @@
 /* ISC license. */
 
-/* OpenBSD needs that for EOVERFLOW. wtfbsdseriously */
-#ifndef _BSD_SOURCE
-#define _BSD_SOURCE
-#endif
-
 #include <skalibs/sysdeps.h>
+#include <skalibs/bsdsnowflake.h>
 #include <time.h>
 #include <errno.h>
 #include <skalibs/uint64.h>
-- 
cgit v1.3.1