Remove unused macros and #include <arpa/inet.h>s.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1289 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 7eb2781bdf8370a3f81830fe3b7b43871750d68e..1767505c66843299abe88226d07bc3ff55cb624f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-12-28  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/sys.h (BITS_ZERO_ON_*, HAVE_RELIABLE_SIGNALS, DOCURSES,
+       DOTERMCAP, IRC_UID, IRC_GID, LIMIT_FMT, FALSE, TRUE): Remove
+       unused macros.
+
+       * ircd/ircd_auth.c, ircd/listener.c, ircd/s_auth.c, ircd/s_bsd.c,
+       ircd/s_conf.c, ircd/uping.c, ircd/whocmds.c: Remove obsolete
+       #include <arpa/inet.h>.
+
 2004-12-28  Michael Poole <mdpoole@troilus.org>
 
        * ircd/match.c: Remove obsolete #include <arpa/inet.h>.

diff --git a/include/sys.h b/include/sys.h
index e35bc97419380eab4cba526baff60dadab439348..7faef89e6bab2c8d6e2877e66b6b424c3deabfab 100644 (file)
--- a/include/sys.h
+++ b/include/sys.h
@@ -21,14 +21,6 @@
 #ifndef INCLUDED_sys_h
 #define INCLUDED_sys_h
 
-#if WORDS_BIGENDIAN
-# define BIT_ZERO_ON_LEFT
-#else
-# define BIT_ZERO_ON_RIGHT
-#endif
-
-#define HAVE_RELIABLE_SIGNALS
-
 /*
  * safety margin so we can always have one spare fd, for motd/authd or
  * whatever else.  -24 allows "safety" margin of 10 listen ports, 8 servers
@@ -36,23 +28,6 @@
  */
 #define MAXCLIENTS      (MAXCONNECTIONS-24)
 
-#ifdef HAVECURSES
-#define DOCURSES
-#else
-#undef DOCURSES
-#endif
-
-#ifdef HAVETERMCAP
-#define DOTERMCAP
-#else
-#undef DOTERMCAP
-#endif
-
-#ifndef CONFIG_SETUGID
-#undef IRC_UID
-#undef IRC_GID
-#endif
-
 /* Define FD_SETSIZE to what we want before including sys/types.h on BSD */
 #if  defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__)
 #if ((!defined(USE_POLL)) && (!defined(FD_SETSIZE)))
@@ -60,16 +35,7 @@
 #endif
 #endif
 
-#define LIMIT_FMT "%d"
-
 #define IRCD_MAX(a, b)  ((a) > (b) ? (a) : (b))
 #define IRCD_MIN(a, b)  ((a) < (b) ? (a) : (b))
 
-#ifndef FALSE
-#define FALSE 0
-#endif
-#ifndef TRUE
-#define TRUE  1
-#endif
-
 #endif /* INCLUDED_sys_h */

diff --git a/ircd/ircd_auth.c b/ircd/ircd_auth.c
index 03c59b804f8095a8ef40b8dd027410d809b95969..afbb9377ca7ca372a07c9b9a88ed6a548aa9475a 100644 (file)
--- a/ircd/ircd_auth.c
+++ b/ircd/ircd_auth.c
@@ -49,7 +49,6 @@
 #include <unistd.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif

diff --git a/ircd/listener.c b/ircd/listener.c
index 76638205f3289f759fb32a5e101541b6c6fd5793..c3f85dd698cc6f9418c430532c32a0c6664e233e 100644 (file)
--- a/ircd/listener.c
+++ b/ircd/listener.c
@@ -50,7 +50,6 @@
 #include <unistd.h>
 #include <netdb.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>
 
 /** List of listening sockets. */
 struct Listener* ListenerPollList = 0;

diff --git a/ircd/s_auth.c b/ircd/s_auth.c
index 2d67d3f3ce333b3af606a59688ce2affa2b7bf06..a7d47f470dd6aaaa57bce981f79d60ea138a741f 100644 (file)
--- a/ircd/s_auth.c
+++ b/ircd/s_auth.c
@@ -54,7 +54,6 @@
 #include "struct.h"
 #include "sys.h"               /* TRUE bleah */
 
-#include <arpa/inet.h>         /* inet_netof */
 #include <netdb.h>             /* struct hostent */
 #include <string.h>
 #include <stdlib.h>

diff --git a/ircd/s_bsd.c b/ircd/s_bsd.c
index 47a9afdc2503b9ea26c27c582664b80fb3d9a6e1..93e8a673edbc6ecf586e6e2c1a0a495f6b7c580c 100644 (file)
--- a/ircd/s_bsd.c
+++ b/ircd/s_bsd.c
@@ -58,7 +58,6 @@
 #include "uping.h"
 #include "version.h"
 
-#include <arpa/inet.h>
 /* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <errno.h>
 #include <fcntl.h>

diff --git a/ircd/s_conf.c b/ircd/s_conf.c
index 2a5e12ea60a2582a4f951552e104deb57f760e82..0d0ff6854e17f80a3c08bc77a08bc8ec9ead5633 100644 (file)
--- a/ircd/s_conf.c
+++ b/ircd/s_conf.c
@@ -57,7 +57,6 @@
 #include "sys.h"
 
 /* #include <assert.h> -- Now using assert in ircd_log.h */
-#include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>

diff --git a/ircd/uping.c b/ircd/uping.c
index c2d70ab857b4c4232403bbc1944852062185ac96..6982577515bdd7e752b5320ba7eb7b6050df1f7a 100644 (file)
--- a/ircd/uping.c
+++ b/ircd/uping.c
@@ -42,7 +42,6 @@
 #include "send.h"
 #include "sys.h"
 
-#include <arpa/inet.h>
 /* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <errno.h>
 #include <netdb.h>

diff --git a/ircd/whocmds.c b/ircd/whocmds.c
index 255c3fd0186a298158dcd509c70521464c75f610..34f7ee72892f4aefb92ae50d8eeae16ba7300867 100644 (file)
--- a/ircd/whocmds.c
+++ b/ircd/whocmds.c
@@ -54,7 +54,6 @@
 #include "whowas.h"
 #include "msg.h"
 
-#include <arpa/inet.h>        /* inet_ntoa */
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>