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

[ci skip]
This commit is contained in:
Aaron Jones 2016-05-14 23:29:33 +00:00
parent be7c282296
commit b143df9ac4
No known key found for this signature in database
GPG key ID: 6E854C0FAAD4CEA4
7 changed files with 3 additions and 22 deletions

View file

@ -83,10 +83,6 @@ struct rb_addrinfo {
#define NI_DGRAM 0x00000010 #define NI_DGRAM 0x00000010
#endif /* NI_DGRAM */ #endif /* NI_DGRAM */
#ifndef INADDR_NONE
#define INADDR_NONE ((unsigned int) 0xffffffff)
#endif /* INADDR_NONE */
int rb_getaddrinfo(const char *hostname, const char *servname, int rb_getaddrinfo(const char *hostname, const char *servname,
const struct rb_addrinfo *hints, struct rb_addrinfo **res); const struct rb_addrinfo *hints, struct rb_addrinfo **res);
void rb_freeaddrinfo(struct rb_addrinfo *ai); void rb_freeaddrinfo(struct rb_addrinfo *ai);

View file

@ -36,6 +36,9 @@
const char *get_windows_nameservers(void); 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 IS_NT() ((int)GetVersion() > 0)
#define WIN_NS_9X "System\\CurrentControlSet\\Services\\VxD\\MSTCP" #define WIN_NS_9X "System\\CurrentControlSet\\Services\\VxD\\MSTCP"

View file

@ -53,7 +53,6 @@
#include "ircd_getopt.h" #include "ircd_getopt.h"
#include "newconf.h" #include "newconf.h"
#include "reject.h" #include "reject.h"
#include "s_conf.h"
#include "s_newconf.h" #include "s_newconf.h"
#include "cache.h" #include "cache.h"
#include "monitor.h" #include "monitor.h"

View file

@ -36,7 +36,6 @@
#include "send.h" #include "send.h"
#include "authproc.h" #include "authproc.h"
#include "reject.h" #include "reject.h"
#include "s_conf.h"
#include "hostmask.h" #include "hostmask.h"
#include "sslproc.h" #include "sslproc.h"
#include "wsproc.h" #include "wsproc.h"
@ -44,10 +43,6 @@
#include "s_assert.h" #include "s_assert.h"
#include "logger.h" #include "logger.h"
#ifndef INADDR_NONE
#define INADDR_NONE ((unsigned int) 0xffffffff)
#endif
#if defined(NO_IN6ADDR_ANY) && defined(RB_IPV6) #if defined(NO_IN6ADDR_ANY) && defined(RB_IPV6)
static const struct in6_addr in6addr_any = static const struct in6_addr in6addr_any =
{ { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }; { { { 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 * 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. * the given fd. The sockhost field is initialized with the ip# of the host.

View file

@ -287,8 +287,6 @@ load_one_module(const char *path, int origin, bool coremodule)
static void increase_modlist(void); static void increase_modlist(void);
#define MODS_INCREMENT 10
static char unknown_ver[] = "<unknown>"; static char unknown_ver[] = "<unknown>";
static char unknown_description[] = "<none>"; static char unknown_description[] = "<none>";

View file

@ -58,10 +58,6 @@ struct config_server_hide ConfigServerHide;
extern int yyparse(void); /* defined in y.tab.c */ extern int yyparse(void); /* defined in y.tab.c */
extern char linebuf[]; extern char linebuf[];
#ifndef INADDR_NONE
#define INADDR_NONE ((unsigned int) 0xffffffff)
#endif
static rb_bh *confitem_heap = NULL; static rb_bh *confitem_heap = NULL;
rb_dlink_list prop_bans; rb_dlink_list prop_bans;

View file

@ -53,10 +53,6 @@
#include "capability.h" #include "capability.h"
#include "s_assert.h" #include "s_assert.h"
#ifndef INADDR_NONE
#define INADDR_NONE ((unsigned int) 0xffffffff)
#endif
int MaxConnectionCount = 1; int MaxConnectionCount = 1;
int MaxClientCount = 1; int MaxClientCount = 1;
int refresh_user_links = 0; int refresh_user_links = 0;