commit 32874e17e9d91e7505ceb386e0bc96a1189a0edb
author Christian Hopps <chopps@gmail.com> Sat May 01 09:43:54 2021 -0400
committer Michal Vasko <mvasko@cesnet.cz> Tue May 04 08:25:30 2021 +0200
tree 47a29c7ea44d4da25bd62fedffb70f79c93666f5
parent b39f56c6c1e849a1af765000d4093951611b8ef4

build BUGFIX fix BSD builds, again, and cleanup

- just define _GNU_SOURCE and include sys/cdefs.h this gets everything
set the right way (no need to define _POSIX_C_SOURCE, etc).
- BSD requires more includes to get to sockaddr and AF_*

src/context.c

diff --git a/src/context.c b/src/context.c
index 9ae7213..b5fe9b4 100644
--- a/src/context.c
+++ b/src/context.c
@@ -11,14 +11,13 @@
  *
  *     https://opensource.org/licenses/BSD-3-Clause
  */
-#define _GNU_SOURCE /* asprintf */
-#define _POSIX_C_SOURCE 200809L /* strdup */
-
+#define _GNU_SOURCE /* asprintf, strdup */
 #if defined (__NetBSD__) || defined (__OpenBSD__)
 /* realpath */
 #define _XOPEN_SOURCE 1
 #define _XOPEN_SOURCE_EXTENDED 1
 #endif
+#include <sys/cdefs.h>
 
 #include "context.h"
 

src/diff.c

diff --git a/src/diff.c b/src/diff.c
index dc2a462..2c98eaa 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -11,8 +11,8 @@
  *
  *     https://opensource.org/licenses/BSD-3-Clause
  */
-#define _POSIX_C_SOURCE 200809L /* strdup */
-#define _GNU_SOURCE /* asprintf */
+#define _GNU_SOURCE /* asprintf, strdup */
+#include <sys/cdefs.h>
 
 #include "diff.h"
 

src/log.c

diff --git a/src/log.c b/src/log.c
index 4cfb01c..0b28570 100644
--- a/src/log.c
+++ b/src/log.c
@@ -12,8 +12,8 @@
  *     https://opensource.org/licenses/BSD-3-Clause
  */
 
-#define _GNU_SOURCE
-#define _POSIX_C_SOURCE 200809L /* strdup */
+#define _GNU_SOURCE /* asprintf, strdup */
+#include <sys/cdefs.h>
 
 #include "log.h"
 

src/out.c

diff --git a/src/out.c b/src/out.c
index c368088..37beb69 100644
--- a/src/out.c
+++ b/src/out.c
@@ -12,8 +12,8 @@
  *     https://opensource.org/licenses/BSD-3-Clause
  */
 
-#define _GNU_SOURCE
-#define _POSIX_C_SOURCE 200809L /* strdup, vdprintf */
+#define _GNU_SOURCE /* asprintf, strdup */
+#include <sys/cdefs.h>
 
 #include "out.h"
 #include "out_internal.h"

src/plugins_types.c

diff --git a/src/plugins_types.c b/src/plugins_types.c
index d176dc2..f4790f9 100644
--- a/src/plugins_types.c
+++ b/src/plugins_types.c
@@ -12,8 +12,8 @@
  *     https://opensource.org/licenses/BSD-3-Clause
  */
 
-#define _GNU_SOURCE
-#define _POSIX_C_SOURCE 200809L /* strdup */
+#define _GNU_SOURCE /* asprintf, strdup */
+#include <sys/cdefs.h>
 
 #include "plugins_types.h"
 

src/plugins_types/ip_prefix.c

diff --git a/src/plugins_types/ip_prefix.c b/src/plugins_types/ip_prefix.c
index 3dcbe50..d6f596c 100644
--- a/src/plugins_types/ip_prefix.c
+++ b/src/plugins_types/ip_prefix.c
@@ -12,11 +12,16 @@
  *     https://opensource.org/licenses/BSD-3-Clause
  */
 
-#define _GNU_SOURCE
+#define _GNU_SOURCE /* asprintf, strdup */
+#include <sys/cdefs.h>
 
 #include "plugins_types.h"
 
 #include <arpa/inet.h>
+#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
+#include <netinet/in.h>
+#include <sys/socket.h>
+#endif
 #include <assert.h>
 #include <errno.h>
 #include <stdint.h>

src/plugins_types/ipv6_address.c

diff --git a/src/plugins_types/ipv6_address.c b/src/plugins_types/ipv6_address.c
index d25d55a..88e00e5 100644
--- a/src/plugins_types/ipv6_address.c
+++ b/src/plugins_types/ipv6_address.c
@@ -12,11 +12,16 @@
  *     https://opensource.org/licenses/BSD-3-Clause
  */
 
-#define _GNU_SOURCE
+#define _GNU_SOURCE /* asprintf, strdup */
+#include <sys/cdefs.h>
 
 #include "plugins_types.h"
 
 #include <arpa/inet.h>
+#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
+#include <netinet/in.h>
+#include <sys/socket.h>
+#endif
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>

src/schema_compile_node.c

diff --git a/src/schema_compile_node.c b/src/schema_compile_node.c
index 1092aee..8a8e6e9 100644
--- a/src/schema_compile_node.c
+++ b/src/schema_compile_node.c
@@ -12,8 +12,8 @@
  *     https://opensource.org/licenses/BSD-3-Clause
  */
 
-#define _GNU_SOURCE
-#define _POSIX_C_SOURCE 200809L /* strdup, strndup */
+#define _GNU_SOURCE /* asprintf, strdup */
+#include <sys/cdefs.h>
 
 #include "schema_compile_node.h"
 

src/tree_schema.c

diff --git a/src/tree_schema.c b/src/tree_schema.c
index fd446a0..09ac9fb 100644
--- a/src/tree_schema.c
+++ b/src/tree_schema.c
@@ -12,8 +12,8 @@
  *     https://opensource.org/licenses/BSD-3-Clause
  */
 
-#define _GNU_SOURCE
-#define _POSIX_C_SOURCE 200809L /* strdup */
+#define _GNU_SOURCE /* asprintf, strdup */
+#include <sys/cdefs.h>
 
 #include "tree_schema.h"
 

src/validation.c

diff --git a/src/validation.c b/src/validation.c
index 8895531..b7f5abb 100644
--- a/src/validation.c
+++ b/src/validation.c
@@ -11,8 +11,8 @@
  *
  *     https://opensource.org/licenses/BSD-3-Clause
  */
-#define _POSIX_C_SOURCE 200809L /* strdup */
-#define _GNU_SOURCE /* asprintf */
+#define _GNU_SOURCE /* asprintf, strdup */
+#include <sys/cdefs.h>
 
 #include "validation.h"
 

src/xpath.c

diff --git a/src/xpath.c b/src/xpath.c
index 5b558f1..0a65830 100644
--- a/src/xpath.c
+++ b/src/xpath.c
@@ -11,11 +11,8 @@
  *
  *     https://opensource.org/licenses/BSD-3-Clause
  */
-#define _GNU_SOURCE
-#define _POSIX_C_SOURCE 200809L /* strdup, strndup */
-
-/* needed by libmath functions isfinite(), isinf(), isnan(), signbit(), ... */
-#define _ISOC99_SOURCE
+#define _GNU_SOURCE /* asprintf, strdup */
+#include <sys/cdefs.h>
 
 #include "xpath.h"
 

tools/re/main.c

diff --git a/tools/re/main.c b/tools/re/main.c
index 9bc5cdf..b512ad8 100644
--- a/tools/re/main.c
+++ b/tools/re/main.c
@@ -12,8 +12,8 @@
  *     https://opensource.org/licenses/BSD-3-Clause
  */
 
-#define _GNU_SOURCE
-#define _POSIX_C_SOURCE 200809L /* strdup, getline */
+#define _GNU_SOURCE /* asprintf, strdup */
+#include <sys/cdefs.h>
 
 #include <errno.h>
 #include <getopt.h>