From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 19 Jul 2018 16:35:19 +0000 (-0400)
Subject: Add build.h and missing.h to all public headers in libfreeradius-util
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59e06aaa117d9e006242d7aca7d3e2de87d90bbf;p=thirdparty%2Ffreeradius-server.git

Add build.h and missing.h to all public headers in libfreeradius-util

This ensures things linking to libfreeradius-util can use the headers individually.
---

diff --git a/src/lib/util/ascend.h b/src/lib/util/ascend.h
index 18d110ce0fd..030fbf2948b 100644
--- a/src/lib/util/ascend.h
+++ b/src/lib/util/ascend.h
@@ -27,6 +27,8 @@ extern "C" {
 #endif
 
 #ifdef WITH_ASCEND_BINARY
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
 #include <freeradius-devel/util/value.h>
 
 /* filters.c */
diff --git a/src/lib/util/base64.h b/src/lib/util/base64.h
index fee40a7e129..29e1af95dd7 100644
--- a/src/lib/util/base64.h
+++ b/src/lib/util/base64.h
@@ -28,6 +28,9 @@ RCSIDH(base64_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/lib/util/cursor.h b/src/lib/util/cursor.h
index 3659f954243..1a6af7cca59 100644
--- a/src/lib/util/cursor.h
+++ b/src/lib/util/cursor.h
@@ -26,6 +26,9 @@ RCSIDH(cursor_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #include <stddef.h>
 #include <talloc.h>
 
diff --git a/src/lib/util/debug.h b/src/lib/util/debug.h
index 31b1e9b5852..c43b00ae9dc 100644
--- a/src/lib/util/debug.h
+++ b/src/lib/util/debug.h
@@ -25,6 +25,8 @@
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
 #include <freeradius-devel/util/fring.h>
 
 #define MEM(x) if (!(x)) { ERROR("%s[%u] OUT OF MEMORY", __FILE__, __LINE__); _fr_exit_now(__FILE__, __LINE__, EXIT_FAILURE); }
diff --git a/src/lib/util/dict.h b/src/lib/util/dict.h
index 36ebb2d8985..ecd0270f51c 100644
--- a/src/lib/util/dict.h
+++ b/src/lib/util/dict.h
@@ -26,6 +26,8 @@
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
 #include <freeradius-devel/util/token.h>
 #include <freeradius-devel/util/types.h>
 
diff --git a/src/lib/util/dlist.h b/src/lib/util/dlist.h
index 17f6573b388..39c06777a06 100644
--- a/src/lib/util/dlist.h
+++ b/src/lib/util/dlist.h
@@ -27,6 +27,9 @@ RCSIDH(dlist_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 /** Entry in a doubly linked list
  *
  */
diff --git a/src/lib/util/event.h b/src/lib/util/event.h
index cb0d26c55ab..ef2cf45da6d 100644
--- a/src/lib/util/event.h
+++ b/src/lib/util/event.h
@@ -28,6 +28,7 @@ RCSIDH(event_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
 #include <freeradius-devel/missing.h>
 
 #include <stdbool.h>
diff --git a/src/lib/util/fifo.h b/src/lib/util/fifo.h
index a026abdf8ed..9443dfbf389 100644
--- a/src/lib/util/fifo.h
+++ b/src/lib/util/fifo.h
@@ -28,6 +28,9 @@ RCSIDH(fifo_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #include <talloc.h>
 
 typedef struct	fr_fifo_t fr_fifo_t;
diff --git a/src/lib/util/fring.h b/src/lib/util/fring.h
index d3d87e27074..50c26b81f98 100644
--- a/src/lib/util/fring.h
+++ b/src/lib/util/fring.h
@@ -27,6 +27,9 @@ RCSIDH(fring_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <talloc.h>
diff --git a/src/lib/util/hash.h b/src/lib/util/hash.h
index 6c054061692..0d784798c56 100644
--- a/src/lib/util/hash.h
+++ b/src/lib/util/hash.h
@@ -27,6 +27,9 @@ RCSIDH(hash_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #include <stddef.h>
 #include <stdint.h>
 #include <talloc.h>
diff --git a/src/lib/util/heap.h b/src/lib/util/heap.h
index 6c935b8dc2c..0442c1a9982 100644
--- a/src/lib/util/heap.h
+++ b/src/lib/util/heap.h
@@ -27,6 +27,9 @@ RCSIDH(heap_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #include <stdint.h>
 #include <sys/types.h>
 #include <talloc.h>
diff --git a/src/lib/util/inet.h b/src/lib/util/inet.h
index f760659a64b..b8d6ee63292 100644
--- a/src/lib/util/inet.h
+++ b/src/lib/util/inet.h
@@ -24,6 +24,9 @@
  */
 RCSIDH(inet_h, "$Id$")
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #include <arpa/inet.h>
 #include <net/if.h>		/* SIOCGIFADDR et al */
 #include <netinet/in.h>		/* in6?_addr */
diff --git a/src/lib/util/log.c b/src/lib/util/log.c
index e7538afbf16..b01773433f9 100644
--- a/src/lib/util/log.c
+++ b/src/lib/util/log.c
@@ -24,7 +24,6 @@ RCSID("$Id$")
 
 #include "log.h"
 
-#include <freeradius-devel/missing.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/strerror.h>
diff --git a/src/lib/util/log.h b/src/lib/util/log.h
index 85252beba33..8942b2b82cf 100644
--- a/src/lib/util/log.h
+++ b/src/lib/util/log.h
@@ -26,6 +26,8 @@ RCSIDH(util_log_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
 #include <freeradius-devel/util/token.h>
 
 #include <stdbool.h>
diff --git a/src/lib/util/md4.h b/src/lib/util/md4.h
index 6363736b3ec..f4da6a14cc2 100644
--- a/src/lib/util/md4.h
+++ b/src/lib/util/md4.h
@@ -12,6 +12,9 @@ RCSIDH(md4_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #ifdef HAVE_INTTYPES_H
 #  include <inttypes.h>
 #endif
diff --git a/src/lib/util/md5.h b/src/lib/util/md5.h
index f94e15a4e67..bbffd0dd761 100644
--- a/src/lib/util/md5.h
+++ b/src/lib/util/md5.h
@@ -11,6 +11,9 @@ RCSIDH(md5_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #ifdef HAVE_INTTYPES_H
 #  include <inttypes.h>
 #endif
diff --git a/src/lib/util/misc.h b/src/lib/util/misc.h
index 69091582d1b..f5147e75bb1 100644
--- a/src/lib/util/misc.h
+++ b/src/lib/util/misc.h
@@ -27,6 +27,7 @@ RCSIDH(misc_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
 #include <freeradius-devel/missing.h>
 #include <freeradius-devel/util/print.h>
 
diff --git a/src/lib/util/net.h b/src/lib/util/net.h
index 66c21273170..fe33806608f 100644
--- a/src/lib/util/net.h
+++ b/src/lib/util/net.h
@@ -32,6 +32,8 @@ extern "C" {
 #  include <pcap.h>
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
 #include <freeradius-devel/util/hash.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/token.h>
diff --git a/src/lib/util/packet.h b/src/lib/util/packet.h
index da51804e168..088591f27a0 100644
--- a/src/lib/util/packet.h
+++ b/src/lib/util/packet.h
@@ -27,6 +27,8 @@ RCSIDH(packet_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
 #include <freeradius-devel/util/inet.h>
 #include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/rbtree.h>
diff --git a/src/lib/util/pair.h b/src/lib/util/pair.h
index 733fea28069..8d1e00b2ddf 100644
--- a/src/lib/util/pair.h
+++ b/src/lib/util/pair.h
@@ -23,6 +23,8 @@
  */
 RCSIDH(pair_h, "$Id$")
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
 #include <freeradius-devel/util/cursor.h>
 #include <freeradius-devel/util/value.h>
 
diff --git a/src/lib/util/pair_cursor.c b/src/lib/util/pair_cursor.c
index 94c73763155..42862c27685 100644
--- a/src/lib/util/pair_cursor.c
+++ b/src/lib/util/pair_cursor.c
@@ -26,6 +26,8 @@
  */
 #include "pair_cursor.h"
 
+#include <freeradius-devel/missing.h>
+
 /** Internal function to update cursor state
  *
  * @param cursor to operate on.
diff --git a/src/lib/util/pair_cursor.h b/src/lib/util/pair_cursor.h
index 548e6231418..22c185ba0f7 100644
--- a/src/lib/util/pair_cursor.h
+++ b/src/lib/util/pair_cursor.h
@@ -26,6 +26,8 @@ RCSIDH(pair_cursor_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
 #include <freeradius-devel/util/pair.h>
 
 VALUE_PAIR	*fr_pair_cursor_init(vp_cursor_t *cursor, VALUE_PAIR * const *node);
diff --git a/src/lib/util/pcap.h b/src/lib/util/pcap.h
index d93cb264d05..cb84562dd9f 100644
--- a/src/lib/util/pcap.h
+++ b/src/lib/util/pcap.h
@@ -30,6 +30,8 @@ extern "C" {
 
 #include "pcap.h"
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
 #include <freeradius-devel/util/net.h>
 
 #include <pcap.h>
diff --git a/src/lib/util/print.h b/src/lib/util/print.h
index 5e7b18a675a..a8718437fa2 100644
--- a/src/lib/util/print.h
+++ b/src/lib/util/print.h
@@ -27,6 +27,9 @@ RCSIDH(print_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #include <stddef.h>
 #include <stdint.h>
 #include <talloc.h>
diff --git a/src/lib/util/proto.h b/src/lib/util/proto.h
index 1a758f0026d..d88d5a21a46 100644
--- a/src/lib/util/proto.h
+++ b/src/lib/util/proto.h
@@ -27,6 +27,8 @@ RCSIDH(proto_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
 #include <freeradius-devel/util/dict.h>
 
 #define CHECK_FREESPACE(_have, _need) \
diff --git a/src/lib/util/rand.h b/src/lib/util/rand.h
index 5b67d0a97c5..273c8bcbb99 100644
--- a/src/lib/util/rand.h
+++ b/src/lib/util/rand.h
@@ -26,6 +26,9 @@ RCSIDH(rand_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/src/lib/util/rbtree.h b/src/lib/util/rbtree.h
index 26e1d88ed8a..eb7c16f8c24 100644
--- a/src/lib/util/rbtree.h
+++ b/src/lib/util/rbtree.h
@@ -27,6 +27,9 @@ RCSIDH(rbtree_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <talloc.h>
diff --git a/src/lib/util/regex.h b/src/lib/util/regex.h
index fbd4d84cd91..db7d2d8bc26 100644
--- a/src/lib/util/regex.h
+++ b/src/lib/util/regex.h
@@ -27,6 +27,9 @@ RCSIDH(regex_h, "$Id$")
 extern "C" {
 #  endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <talloc.h>
diff --git a/src/lib/util/sha1.h b/src/lib/util/sha1.h
index 08561a7bed6..8856a811acb 100644
--- a/src/lib/util/sha1.h
+++ b/src/lib/util/sha1.h
@@ -13,6 +13,9 @@ RCSIDH(sha1_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #ifdef WITH_OPENSSL_SHA1
 #  include <openssl/sha.h>
 #endif
diff --git a/src/lib/util/snprintf.h b/src/lib/util/snprintf.h
index e1a913a0fd9..ccced37d610 100644
--- a/src/lib/util/snprintf.h
+++ b/src/lib/util/snprintf.h
@@ -37,6 +37,9 @@ RCSIDH(snprintf_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #if __STDC__
 #include <stdarg.h>
 #else
diff --git a/src/lib/util/socket.h b/src/lib/util/socket.h
index cf8237cc64b..326a78ebc18 100644
--- a/src/lib/util/socket.h
+++ b/src/lib/util/socket.h
@@ -31,6 +31,8 @@ RCSIDH(socket_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
 #include <freeradius-devel/util/inet.h>
 
 #include <stdbool.h>
diff --git a/src/lib/util/strerror.h b/src/lib/util/strerror.h
index 67722e96f3e..36e8db9a7be 100644
--- a/src/lib/util/strerror.h
+++ b/src/lib/util/strerror.h
@@ -28,6 +28,9 @@ RCSIDH(strerror_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #include <string.h>
 
 void		fr_strerror_printf(char const *, ...) CC_HINT(format (printf, 1, 2));
diff --git a/src/lib/util/syserror.c b/src/lib/util/syserror.c
index 080f370ef98..1eabbc575c0 100644
--- a/src/lib/util/syserror.c
+++ b/src/lib/util/syserror.c
@@ -25,7 +25,6 @@ RCSID("$Id$")
 
 #include "syserror.h"
 
-#include <freeradius-devel/missing.h>
 #include <freeradius-devel/util/log.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/thread_local.h>
diff --git a/src/lib/util/syserror.h b/src/lib/util/syserror.h
index d0e38609031..80147189c8d 100644
--- a/src/lib/util/syserror.h
+++ b/src/lib/util/syserror.h
@@ -28,6 +28,9 @@ RCSIDH(syserror_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #include <errno.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/src/lib/util/talloc.c b/src/lib/util/talloc.c
index 04bfb3f1ea7..082de53ddf3 100644
--- a/src/lib/util/talloc.c
+++ b/src/lib/util/talloc.c
@@ -23,8 +23,6 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/util/talloc.h>
-
 #include <string.h>
 
 typedef struct fr_talloc_link  fr_talloc_link_t;
diff --git a/src/lib/util/talloc.h b/src/lib/util/talloc.h
index 5a16d72bd35..827bf9d21c8 100644
--- a/src/lib/util/talloc.h
+++ b/src/lib/util/talloc.h
@@ -28,6 +28,7 @@ RCSIDH(talloc_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
 #include <freeradius-devel/missing.h>
 
 #include <ctype.h>
diff --git a/src/lib/util/thread_local.h b/src/lib/util/thread_local.h
index 07d8ce5aa99..eff086dfec8 100644
--- a/src/lib/util/thread_local.h
+++ b/src/lib/util/thread_local.h
@@ -29,6 +29,9 @@ RCSIDH(thread_local_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #include <errno.h>
 
 typedef void (*pthread_destructor_t)(void*);
diff --git a/src/lib/util/token.h b/src/lib/util/token.h
index 78567123567..cc1313615c1 100644
--- a/src/lib/util/token.h
+++ b/src/lib/util/token.h
@@ -29,6 +29,9 @@ RCSIDH(token_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #include <stdbool.h>
 #include <stdint.h>
 
diff --git a/src/lib/util/trie.c b/src/lib/util/trie.c
index ba05daec590..1bf5a7066df 100644
--- a/src/lib/util/trie.c
+++ b/src/lib/util/trie.c
@@ -22,7 +22,6 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/talloc.h>
diff --git a/src/lib/util/trie.h b/src/lib/util/trie.h
index 572eb2ddcda..a61739c270a 100644
--- a/src/lib/util/trie.h
+++ b/src/lib/util/trie.h
@@ -27,6 +27,9 @@ RCSIDH(trie_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/src/lib/util/udp.c b/src/lib/util/udp.c
index 0df8f8cfa37..4a3b5eaed30 100644
--- a/src/lib/util/udp.c
+++ b/src/lib/util/udp.c
@@ -22,10 +22,11 @@
  */
 RCSID("$Id$")
 
+#include "udp.h"
+
 #include <freeradius-devel/util/log.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/syserror.h>
-#include <freeradius-devel/util/udp.h>
 
 /*
  *	This is easier than ifdef's in the function definition.
diff --git a/src/lib/util/udp.h b/src/lib/util/udp.h
index 11ac019ea1f..4a1904e18f4 100644
--- a/src/lib/util/udp.h
+++ b/src/lib/util/udp.h
@@ -27,6 +27,8 @@ RCSIDH(udp_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
 #ifdef WITH_UDPFROMTO
 #  include <freeradius-devel/util/udpfromto.h>
 #endif
diff --git a/src/lib/util/udpfromto.h b/src/lib/util/udpfromto.h
index 91545a519d0..27ed0c82771 100644
--- a/src/lib/util/udpfromto.h
+++ b/src/lib/util/udpfromto.h
@@ -30,6 +30,9 @@ extern "C" {
 #endif
 
 #ifdef WITH_UDPFROMTO
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #include <netinet/in.h>
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/src/lib/util/value.h b/src/lib/util/value.h
index 7318e5622cb..301ee08cf92 100644
--- a/src/lib/util/value.h
+++ b/src/lib/util/value.h
@@ -27,6 +27,7 @@ RCSIDH(value_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
 #include <freeradius-devel/missing.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/inet.h>
diff --git a/src/lib/util/version.h b/src/lib/util/version.h
index f7bf49871a0..dcc814ba3ac 100644
--- a/src/lib/util/version.h
+++ b/src/lib/util/version.h
@@ -28,6 +28,9 @@ RCSIDH(version_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/build.h>
+#include <freeradius-devel/missing.h>
+
 #include <stdint.h>
 
 #ifndef NDEBUG