minor spring cleaning: remove/relocate duplicate/unused includes & macros

[ci skip]

diff --git a/authd/getaddrinfo.h b/authd/getaddrinfo.h
index 9916629b2f2b22cd10e07918d07a0dea7232a33e..79581d92a36b24e351838b8017cc38473eb654b0 100644 (file)
--- a/authd/getaddrinfo.h
+++ b/authd/getaddrinfo.h
@@ -83,10 +83,6 @@ struct rb_addrinfo {
 #define NI_DGRAM        0x00000010
 #endif /* NI_DGRAM */
 
-#ifndef INADDR_NONE
-#define INADDR_NONE ((unsigned int) 0xffffffff)
-#endif /* INADDR_NONE */
-
 int rb_getaddrinfo(const char *hostname, const char *servname,
                            const struct rb_addrinfo *hints, struct rb_addrinfo **res);
 void rb_freeaddrinfo(struct rb_addrinfo *ai);

diff --git a/authd/reslist.c b/authd/reslist.c
index 07f16e23ed866cad4b7b252e23910ce39bfe7d02..1a17ec2e636f6b31a485429497b88f4163d8802f 100644 (file)
--- a/authd/reslist.c
+++ b/authd/reslist.c
@@ -36,6 +36,9 @@
 
 const char *get_windows_nameservers(void);
 
+#ifndef INADDR_NONE
+#define INADDR_NONE ((unsigned int) 0xffffffff)
+#endif /* INADDR_NONE */
 
 #define IS_NT()               ((int)GetVersion() > 0)
 #define WIN_NS_9X      "System\\CurrentControlSet\\Services\\VxD\\MSTCP"

diff --git a/ircd/ircd.c b/ircd/ircd.c
index 9bd415d20da7fc0cc469e877ab56bd6febf8575f..998e2c879a10eccc3787818e844af8e3d9e7c03d 100644 (file)
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -53,7 +53,6 @@
 #include "ircd_getopt.h"
 #include "newconf.h"
 #include "reject.h"
-#include "s_conf.h"
 #include "s_newconf.h"
 #include "cache.h"
 #include "monitor.h"

diff --git a/ircd/listener.c b/ircd/listener.c
index cfc4ab146d7e75dd44c84c1e0595a45762c2dabd..ba4a11505b0713177915d7bbfd78ccc7393f8d47 100644 (file)
--- a/ircd/listener.c
+++ b/ircd/listener.c
@@ -36,7 +36,6 @@
 #include "send.h"
 #include "authproc.h"
 #include "reject.h"
-#include "s_conf.h"
 #include "hostmask.h"
 #include "sslproc.h"
 #include "wsproc.h"
@@ -44,10 +43,6 @@
 #include "s_assert.h"
 #include "logger.h"
 
-#ifndef INADDR_NONE
-#define INADDR_NONE ((unsigned int) 0xffffffff)
-#endif
-
 #if defined(NO_IN6ADDR_ANY) && defined(RB_IPV6)
 static const struct in6_addr in6addr_any =
 { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
@@ -444,8 +439,6 @@ close_listeners()
        }
 }
 
-#define DLINE_WARNING "ERROR :You have been D-lined.\r\n"
-
 /*
  * add_connection - creates a client which has just connected to us on
  * the given fd. The sockhost field is initialized with the ip# of the host.

diff --git a/ircd/modules.c b/ircd/modules.c
index 2cd59b6b4f551e6b350fd4c15cd7382e8cd5894f..671bf64103bbd5a0576c165a39cf4faff2547c17 100644 (file)
--- a/ircd/modules.c
+++ b/ircd/modules.c
@@ -287,8 +287,6 @@ load_one_module(const char *path, int origin, bool coremodule)
 
 static void increase_modlist(void);
 
-#define MODS_INCREMENT 10
-
 static char unknown_ver[] = "<unknown>";
 static char unknown_description[] = "<none>";
 

diff --git a/ircd/s_conf.c b/ircd/s_conf.c
index 94bb8a4f6c8b550d74f96e1f5b85f8cb633d0ff8..2a7d5b971ad5ff46f1e40653cf84391b3ca035a6 100644 (file)
--- a/ircd/s_conf.c
+++ b/ircd/s_conf.c
@@ -58,10 +58,6 @@ struct config_server_hide ConfigServerHide;
 extern int yyparse(void);              /* defined in y.tab.c */
 extern char linebuf[];
 
-#ifndef INADDR_NONE
-#define INADDR_NONE ((unsigned int) 0xffffffff)
-#endif
-
 static rb_bh *confitem_heap = NULL;
 
 rb_dlink_list prop_bans;

diff --git a/ircd/s_serv.c b/ircd/s_serv.c
index 6f43537fc1a5c38c0f12bc798a07880802558506..7b5d15cb773c2ec9f23119e5d29800f119f52cf2 100644 (file)
--- a/ircd/s_serv.c
+++ b/ircd/s_serv.c
@@ -53,10 +53,6 @@
 #include "capability.h"
 #include "s_assert.h"
 
-#ifndef INADDR_NONE
-#define INADDR_NONE ((unsigned int) 0xffffffff)
-#endif
-
 int MaxConnectionCount = 1;
 int MaxClientCount = 1;
 int refresh_user_links = 0;