Include config.h explicitly.

diff --git a/cap.c b/cap.c
index d213706..34e3832 100644 (file)
--- a/cap.c
+++ b/cap.c
@@ -9,6 +9,7 @@
 
 #include "darkstat.h"
 #include "cap.h"
+#include "config.h"
 #include "conv.h"
 #include "decode.h"
 #include "hosts_db.h"

diff --git a/conv.c b/conv.c
index f45ae6e..8097278 100644 (file)
--- a/conv.c
+++ b/conv.c
@@ -17,6 +17,7 @@
  */
 
 #include "darkstat.h"
+#include "config.h"
 #include "conv.h"
 
 #include <sys/wait.h>

diff --git a/conv.h b/conv.h
index b354b0a..566055d 100644 (file)
--- a/conv.h
+++ b/conv.h
@@ -5,6 +5,7 @@
  */
 
 #include <sys/types.h>
+#include "config.h"
 
 void *xmalloc(const size_t size);
 void *xcalloc(const size_t num, const size_t size);

diff --git a/darkstat.c b/darkstat.c
index 3a0ca08..217d0e2 100644 (file)
--- a/darkstat.c
+++ b/darkstat.c
@@ -10,6 +10,7 @@
 #include "darkstat.h"
 #include "acct.h"
 #include "cap.h"
+#include "config.h"
 #include "conv.h"
 #include "daylog.h"
 #include "db.h"

diff --git a/darkstat.h b/darkstat.h
index 0124cdc..d6b463c 100644 (file)
--- a/darkstat.h
+++ b/darkstat.h
@@ -4,14 +4,6 @@
  * darkstat.h: general macros
  */
 
-/*
- * We only care about the following from config.h:
- * - PACKAGE_NAME
- * - PACKAGE_VERSION
- * - PACKAGE_STRING
- */
-#include "config.h"
-
 #ifdef __GNUC__
 # define _unused_ __attribute__((__unused__))
 # define _noreturn_ __attribute__((__noreturn__))

diff --git a/decode.c b/decode.c
index 25671c5..6acf06f 100644 (file)
--- a/decode.c
+++ b/decode.c
@@ -13,6 +13,7 @@
 #include "darkstat.h"
 #include "acct.h"
 #include "cap.h"
+#include "config.h"
 #include "decode.h"
 #include "err.h"
 #include "opt.h"

diff --git a/dns.c b/dns.c
index ba61adf..a79b6bc 100644 (file)
--- a/dns.c
+++ b/dns.c
@@ -9,6 +9,7 @@
 
 #include "darkstat.h"
 #include "conv.h"
+#include "config.h"
 #include "decode.h"
 #include "dns.h"
 #include "err.h"

diff --git a/html.c b/html.c
index 116cc62..6e98aaa 100644 (file)
--- a/html.c
+++ b/html.c
@@ -9,6 +9,7 @@
  */
 
 #include "darkstat.h"
+#include "config.h"
 #include "str.h"
 #include "html.h"
 #include "http.h" /* for http_base_url */

diff --git a/html.h b/html.h
index 8e5d915..bfe86b4 100644 (file)
--- a/html.h
+++ b/html.h
@@ -7,8 +7,6 @@
 #ifndef __DARKSTAT_HTML_H
 #define __DARKSTAT_HTML_H
 
-#include "config.h" /* for PACKAGE_STRING */
-
 void html_open(struct str *buf, const char *title,
     const int want_graph_js);
 void html_close(struct str *buf);

diff --git a/http.c b/http.c
index 7a4826c..10d0769 100644 (file)
--- a/http.c
+++ b/http.c
@@ -10,6 +10,7 @@
 
 #include "darkstat.h"
 #include "http.h"
+#include "config.h"
 #include "conv.h"
 #include "hosts_db.h"
 #include "graph_db.h"