Lose a few always-true #ifdef wrappers. [skip ci]

diff --git a/print-domain.c b/print-domain.c
index ad08073f129c51d0468f4d8cfd85dbb38c399dcd..df10e967f5a8764859859a7759164867cca78bc7 100644 (file)
--- a/print-domain.c
+++ b/print-domain.c
@@ -667,9 +667,7 @@ ns_rprint(netdissect_options *ndo,
        case T_NS:
        case T_CNAME:
        case T_PTR:
-#ifdef T_DNAME
        case T_DNAME:
-#endif
                ND_PRINT(" ");
                if (fqdn_print(ndo, cp, bp) == NULL)
                        return(NULL);

diff --git a/print-nflog.c b/print-nflog.c
index 9d8d759b55a9498f4b7a75a006907a7907bcc25d..1e75561b967dc01b60e62e3af432f246ae5696b4 100644 (file)
--- a/print-nflog.c
+++ b/print-nflog.c
@@ -105,9 +105,7 @@ typedef struct nflog_timestamp {
 
 static const struct tok nflog_values[] = {
        { AF_INET,              "IPv4" },
-#ifdef AF_INET6
        { AF_INET6,             "IPv6" },
-#endif /*AF_INET6*/
        { 0,                    NULL }
 };
 
@@ -209,11 +207,9 @@ nflog_if_print(netdissect_options *ndo,
                ip_print(ndo, p, length);
                break;
 
-#ifdef AF_INET6
        case AF_INET6:
                ip6_print(ndo, p, length);
                break;
-#endif /* AF_INET6 */
 
        default:
                if (!ndo->ndo_eflag)

diff --git a/print-telnet.c b/print-telnet.c
index 817d4226855d4d62f9621cbc063fcbbe433d22c5..f760db9098bf82e235dfa6691f56e2c7a1b04a98 100644 (file)
--- a/print-telnet.c
+++ b/print-telnet.c
@@ -59,9 +59,6 @@
 #include "extract.h"
 
 
-#define TELCMDS
-#define TELOPTS
-
 /*     NetBSD: telnet.h,v 1.9 2001/06/11 01:50:50 wiz Exp      */
 
 /*
@@ -90,15 +87,11 @@
 
 #define SYNCH  242             /* for telfunc calls */
 
-#ifdef TELCMDS
 static const char *telcmds[] = {
        "EOF", "SUSP", "ABORT", "EOR",
        "SE", "NOP", "DMARK", "BRK", "IP", "AO", "AYT", "EC",
        "EL", "GA", "SB", "WILL", "WONT", "DO", "DONT", "IAC", 0,
 };
-#else
-extern char *telcmds[];
-#endif
 
 #define        TELCMD_FIRST    xEOF
 #define        TELCMD_LAST     IAC
@@ -151,7 +144,6 @@ extern char *telcmds[];
 
 
 #define        NTELOPTS        (1+TELOPT_NEW_ENVIRON)
-#ifdef TELOPTS
 static const char *telopts[NTELOPTS+1] = {
        "BINARY", "ECHO", "RCP", "SUPPRESS GO AHEAD", "NAME",
        "STATUS", "TIMING MARK", "RCTE", "NAOL", "NAOP",
@@ -169,7 +161,6 @@ static const char *telopts[NTELOPTS+1] = {
 #define        TELOPT_LAST     TELOPT_NEW_ENVIRON
 #define        TELOPT_OK(x)    ((unsigned int)(x) <= TELOPT_LAST)
 #define        TELOPT(x)       telopts[(x)-TELOPT_FIRST]
-#endif
 
 /* sub-option qualifiers */
 #define        TELQUAL_IS      0       /* option is... */