Fix some fallout from prior

diff --git a/configure b/configure
index a0243dacba5cedf168ee5a31218785f7e4e47b66..47371e1fee31f9e74dd41e2952c3d88ab21da684 100755 (executable)
--- a/configure
+++ b/configure
@@ -1218,7 +1218,7 @@ EOF
        rm -f _rbtree.c _rbtree
 fi
 if [ "$RBTREE" = no ]; then
-       echo "#define   RBLOCAL" >>$CONFIG_H
+       echo "RBTREE_CPPFLAGS=          -DRBLOCAL" >>$CONFIG_MK
        echo "VENDOR_SRCS+=     vendor/rbtree.c" >>$CONFIG_MK
 else
        echo "#define   HAVE_SYS_RBTREE_H" >>$CONFIG_H

diff --git a/src/Makefile b/src/Makefile
index f308ae1a95a4a5eb73d95b2e22dcc5565edf1c96..65a7397175e1cb4b6771b912acf43f8e3dba8d0f 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -55,6 +55,9 @@ all: ${TOP}/config.h ${PROG} ${SCRIPTS} ${MAN5} ${MAN8}
 dev:
        cd dev && ${MAKE}
 
+../vendor/rbtree.o:
+       ${CC} ${CFLAGS} ${CPPFLAGS} ${RBTREE_CFLAGS} ${RBTREE_CPPFLAGS} -c $< -o $@
+
 .c.o:
        ${CC} ${CFLAGS} ${CPPFLAGS} -c $< -o $@
 

diff --git a/src/control.h b/src/control.h
index 8a3d3d590e4038786d713755da9797ac707fa7be..ef5922689e57487f234c11326439b5cf18782e54 100644 (file)
--- a/src/control.h
+++ b/src/control.h
@@ -32,6 +32,7 @@
 #include <stdbool.h>
 
 #include "dhcpcd.h"
+#include "queue.h"
 
 #if !defined(CTL_FREE_LIST)
 #define        CTL_FREE_LIST 1

diff --git a/src/queue.h b/src/queue.h
new file mode 100644 (file)
index 0000000..efc69ab
--- /dev/null
+++ b/src/queue.h
@@ -0,0 +1,17 @@
+/*
+ * This stub exists becuase we know a modern BSD supports all TAILQ
+ * and glibc, musl et all, don't.
+ */
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
+#include <sys/param.h>
+#endif
+#ifdef BSD
+#include <sys/queue.h>
+/* Dragonfly BSD needs this :( */
+#if !defined(TAILQ_FOREACH_SAFE) && defined(TAILQ_FOREACH_MUTABLE)
+#define        TAILQ_FOREACH_SAFE      TAILQ_FOREACH_MUTABLE
+#endif
+#else
+#error
+#include "../vendor/queue.h"
+#endif