diff options
| author | guy <guy> | 2000-07-14 02:49:00 +0000 |
|---|---|---|
| committer | guy <guy> | 2000-07-14 02:49:00 +0000 |
| commit | cdae010076e6526a8c8684006fbcb27c662a1e04 (patch) | |
| tree | eb4def562f388b0e70c8fa29a47fc3b8f611a771 /print-udp.c | |
| parent | b0d41c68a5a343b5268fc82da350b0d6378730ff (diff) | |
| download | tcpdump-cdae010076e6526a8c8684006fbcb27c662a1e04.tar.gz | |
Include our own "nameser.h", rather than the system's <arpa/nameser.h>,
to get NAMESERVER_PORT defined.
<arpa/nameser.h> defines T_UNSPEC; that causes collisions on Solaris
(and probably at least some other OSes) with stuff included by
<rpc/rpc.h>, generating noise when compiling. Move the include of
"nameser.h" near the includes of other protocol-defining header
files in tcpdump; this also moves it below the include of <rpc/rpc.h>,
so we can then move the #undefs of NOERROR and T_UNSPEC below most
includes and still have it before the include of "nameser.h", squelching
the compiler complaints.
Diffstat (limited to 'print-udp.c')
| -rw-r--r-- | print-udp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/print-udp.c b/print-udp.c index e44cabff..ec26fcef 100644 --- a/print-udp.c +++ b/print-udp.c @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.73 2000-04-27 11:09:08 itojun Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.74 2000-07-14 02:49:00 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -39,13 +39,6 @@ static const char rcsid[] = #include <netinet/udp.h> #include <netinet/udp_var.h> -#ifdef NOERROR -#undef NOERROR /* Solaris sucks */ -#endif -#ifdef T_UNSPEC -#undef T_UNSPEC /* SINIX does too */ -#endif -#include <arpa/nameser.h> #ifdef SEGSIZE #undef SEGSIZE #endif @@ -63,6 +56,13 @@ static const char rcsid[] = #include "addrtoname.h" #include "appletalk.h" +#ifdef NOERROR +#undef NOERROR /* Solaris sucks */ +#endif +#ifdef T_UNSPEC +#undef T_UNSPEC /* SINIX does too */ +#endif +#include "nameser.h" #include "nfs.h" #include "bootp.h" |