Adapt for Atheme v7.3 codebase header file changes

The atheme.h in v7.3 includes all headers necessary, so we should only
include other Atheme headers if we are building for v7.2 or lower; not
only is including them pointless, but they no longer exist at the old
paths as of Atheme commit 81323dfcaa240ac5ca48

diff --git a/backtrace.c b/backtrace.c
index 1e713d11f292aa519f6648948e62b9e142ed5d4e..686d2bc8daf3f97bd9dd0ff38ed417a01625066a 100644 (file)
--- a/backtrace.c
+++ b/backtrace.c
@@ -7,6 +7,10 @@
 
 #include "atheme-compat.h"
 
+#if (CURRENT_ABI_REVISION < 730000)
+#  include "serno.h"
+#endif
+
 #if (defined(__linux__) || defined(__Linux__)) && defined(__GLIBC__)
 #  if (__GLIBC__ == 2) && defined(__GLIBC_MINOR__) && (__GLIBC_MINOR__ >= 1)
 #    define HAVE_BACKTRACE_SUPPORT      1
@@ -23,8 +27,6 @@
 #include <signal.h>
 #include <sys/resource.h>
 
-#include "serno.h"
-
 #define MIN_STACK_FRAMES        3
 #define MAX_STACK_FRAMES        64
 

diff --git a/cs_access_alias.c b/cs_access_alias.c
index d649639cb6d8345bad758e48d4413899271e69ad..b71e91023621983f195b1058520ec27588be4be9 100644 (file)
--- a/cs_access_alias.c
+++ b/cs_access_alias.c
@@ -6,7 +6,10 @@
  */
 
 #include "atheme-compat.h"
-#include "template.h"
+
+#if (CURRENT_ABI_REVISION < 730000)
+#  include "template.h"
+#endif
 
 typedef struct {
        const char *res;

diff --git a/cs_regnotice.c b/cs_regnotice.c
index 3cb86bdb72016136cdebe640f157b3a58e31c949..458b3031d977ef556faecd9010581bde957a30f0 100644 (file)
--- a/cs_regnotice.c
+++ b/cs_regnotice.c
@@ -6,7 +6,10 @@
  */
 
 #include "atheme-compat.h"
-#include "conf.h"
+
+#if (CURRENT_ABI_REVISION < 730000)
+#  include "conf.h"
+#endif
 
 static mowgli_list_t regnotices = { NULL, NULL, 0 };
 

diff --git a/dnsbl.c b/dnsbl.c
index 3b22433f2091c407fdd8b306443db71467512053..0b2507cbe96f89af63ba3db9a36a46bf33ac11bb 100644 (file)
--- a/dnsbl.c
+++ b/dnsbl.c
@@ -42,7 +42,10 @@
  */
 
 #include "atheme-compat.h"
-#include "conf.h"
+
+#if (CURRENT_ABI_REVISION < 730000)
+#  include "conf.h"
+#endif
 
 /* A configured DNSBL */
 struct Blacklist {

diff --git a/gen_echoserver.c b/gen_echoserver.c
index 7a6459c7f72f7592a1f64934decb901ee4f14af7..7dbe2f2dc35b5c15976ad80f90b991a1fbcec261 100644 (file)
--- a/gen_echoserver.c
+++ b/gen_echoserver.c
@@ -6,7 +6,10 @@
  */
 
 #include "atheme-compat.h"
-#include "datastream.h"
+
+#if (CURRENT_ABI_REVISION < 730000)
+#  include "datastream.h"
+#endif
 
 static connection_t *listener = NULL;
 

diff --git a/gen_listenerdemo.c b/gen_listenerdemo.c
index d17f49caeeb0470ed05d394dd38f4ca7a538047c..c8124f76d8fb8276ac9cf797dd7cdbacffcd220f 100644 (file)
--- a/gen_listenerdemo.c
+++ b/gen_listenerdemo.c
@@ -6,7 +6,10 @@
  */
 
 #include "atheme-compat.h"
-#include "datastream.h"
+
+#if (CURRENT_ABI_REVISION < 730000)
+#  include "datastream.h"
+#endif
 
 static connection_t *listener = NULL;
 

diff --git a/ns_ajoin.c b/ns_ajoin.c
index c14fadfeb2f629ed41a47f7fd46e087285e4d385..b24f60f03537bd539dd39a02be7dea328cb6ccab 100644 (file)
--- a/ns_ajoin.c
+++ b/ns_ajoin.c
@@ -7,7 +7,10 @@
  */
 
 #include "atheme-compat.h"
-#include "uplink.h"
+
+#if (CURRENT_ABI_REVISION < 730000)
+#  include "uplink.h"
+#endif
 
 static void
 ns_cmd_ajoin_syntaxerr(sourceinfo_t *si)

diff --git a/ns_guestnoreg.c b/ns_guestnoreg.c
index b57f8ea6b176536149de1901dcea864444f8ea0a..5af6d8781a4b68b5105d88f25a80a0d987f635f8 100644 (file)
--- a/ns_guestnoreg.c
+++ b/ns_guestnoreg.c
@@ -14,7 +14,10 @@
  */
 
 #include "atheme-compat.h"
-#include "conf.h"
+
+#if (CURRENT_ABI_REVISION < 730000)
+#  include "conf.h"
+#endif
 
 static mowgli_list_t guestnicks = { NULL, NULL, 0 };
 

diff --git a/ns_regnotice.c b/ns_regnotice.c
index 2cace2f1368f46be4a9eea2bf1c59cc1a62f1d60..86803d65adb41426e03a7b5a5e806f3daf44c00f 100644 (file)
--- a/ns_regnotice.c
+++ b/ns_regnotice.c
@@ -6,7 +6,10 @@
  */
 
 #include "atheme-compat.h"
-#include "conf.h"
+
+#if (CURRENT_ABI_REVISION < 730000)
+#  include "conf.h"
+#endif
 
 static mowgli_list_t regnotices = { NULL, NULL, 0 };
 

diff --git a/ns_waitreg.c b/ns_waitreg.c
index 52728acb7a9be245627c784ed7128125861d8e18..b7396d8d94f814dc7c9768893361b2d9d119c0f1 100644 (file)
--- a/ns_waitreg.c
+++ b/ns_waitreg.c
@@ -6,7 +6,11 @@
  */
 
 #include "atheme-compat.h"
-#include "conf.h"
+
+#if (CURRENT_ABI_REVISION < 730000)
+#  include "conf.h"
+#endif
+
 #include <limits.h>
 
 unsigned int waitreg_time = 0;

diff --git a/on_db_save.c b/on_db_save.c
index 02603a05dfbff3eef3ad14dcbac1f25889ab77b6..edb410b240aba50bad20e4410c290fa18300bb81 100644 (file)
--- a/on_db_save.c
+++ b/on_db_save.c
@@ -1,6 +1,9 @@
 #include "atheme-compat.h"
-#include "conf.h"
-#include "datastream.h"
+
+#if (CURRENT_ABI_REVISION < 730000)
+#  include "conf.h"
+#  include "datastream.h"
+#endif
 
 #ifndef _WIN32
 

diff --git a/os_helpme.c b/os_helpme.c
index 7e1938ad655131ac1e6da8c9067c9d9589307fe0..d7e96c64d4c2e7fac4751bf721acf673f1e45812 100644 (file)
--- a/os_helpme.c
+++ b/os_helpme.c
@@ -3,7 +3,10 @@
  */
 
 #include "atheme-compat.h"
-#include "uplink.h"            /* sts() */
+
+#if (CURRENT_ABI_REVISION < 730000)
+#  include "uplink.h"          /* sts() */
+#endif
 
 static void
 os_cmd_helpme(sourceinfo_t *si, int parc, char *parv[])

diff --git a/os_testproc.c b/os_testproc.c
index 48b3ce9634f63a3b7b955a990611bc7563f8b7ba..cb8c0e2d171abe38749e3aa2bcd577b21dfc529c 100644 (file)
--- a/os_testproc.c
+++ b/os_testproc.c
@@ -6,7 +6,10 @@
  */
 
 #include "atheme-compat.h"
-#include "datastream.h"
+
+#if (CURRENT_ABI_REVISION < 730000)
+#  include "datastream.h"
+#endif
 
 #ifndef _WIN32