From c0bc799c3e5eb379b63a409f9dc5ea2b60a2bc91 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Thu, 26 Mar 2015 17:03:55 -0500
Subject: [PATCH] Fix some C99 compat issues with FreeBSD

---
 configure       | 11 +++++++++++
 configure.ac    | 10 ++++++++++
 src/Makefile.in |  6 ++++--
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index bd677892..5df7c0c9 100755
--- a/configure
+++ b/configure
@@ -633,6 +633,7 @@ ac_includes_default="\
 #endif"
 
 ac_subst_vars='LTLIBOBJS
+C99COMPATFLAGS
 LIBOBJS
 TRUST_ANCHOR_FILE
 CHECK_EV_PROG
@@ -13755,6 +13756,16 @@ _ACEOF
 
 
 
+case `uname` in
+FreeBSD)
+	C99COMPATFLAGS=""
+;;
+*)
+	C99COMPATFLAGS="-D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600"
+;;
+esac
+
+
 
 
 
diff --git a/configure.ac b/configure.ac
index 66dfd16a..56fb6167 100755
--- a/configure.ac
+++ b/configure.ac
@@ -651,6 +651,16 @@ AC_DEFINE(USE_MINI_EVENT, 1, [Needed for sync stub resolver functions])
 
 AC_TYPE_SIGNAL
 
+case `uname` in
+FreeBSD)
+	C99COMPATFLAGS=""
+;;
+*)
+	C99COMPATFLAGS="-D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600"
+;;
+esac
+AC_SUBST(C99COMPATFLAGS)
+
 AH_BOTTOM([
 #include <stdint.h>
 
diff --git a/src/Makefile.in b/src/Makefile.in
index b14c5163..7a7f3791 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -61,6 +61,8 @@ EXTENSION_LIBUV_LIB=@EXTENSION_LIBUV_LIB@
 EXTENSION_LIBUV_EXT_LIBS=@EXTENSION_LIBUV_EXT_LIBS@
 EXTENSION_LIBUV_LDFLAGS=@EXTENSION_LIBUV_LDFLAGS@
 
+C99COMPATFLAGS=@C99COMPATFLAGS@
+
 GETDNS_OBJ=const-info.lo convert.lo dict.lo dnssec.lo general.lo \
 	getdns_error.lo list.lo request-internal.lo \
 	rr-dict.lo rr-iter.lo stub.lo sync.lo util-internal.lo
@@ -106,10 +108,10 @@ $(EXTENSION_OBJ):
 	$(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) -c $(srcdir)/extension/$(@:.lo=.c) -o $@
 
 context.lo:
-	$(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 -c $(srcdir)/context.c -o context.lo
+	$(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) $(C99COMPATFLAGS) -c $(srcdir)/context.c -o context.lo
 
 libuv.lo:
-	$(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 -c $(srcdir)/extension/libuv.c -o libuv.lo
+	$(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) $(C99COMPATFLAGS) -c $(srcdir)/extension/libuv.c -o libuv.lo
 
 install:	libgetdns.la
 	$(INSTALL) -m 755 -d $(DESTDIR)$(includedir)