From e4b93879cf7649db0114ff8740c27a9b1dd64ff4 Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 26 Jun 2001 06:19:03 +0000 Subject: Move all the "undefine so that the compiler doesn't whine about redefinitions" stuff from files that include "nameser.h" to "nameser.h" itself (we used to include , over which we had no control so we couldn't do that, but we now have our own "nameser.h"). Add T_OPT to the list of things we undefine, and undefine T_UNSPEC iff T_UNSPEC is defined, not iff NOERROR is defined. Replace the include of in "print-rx.c" with an include of "nameser.h", and "#if 0" it out pending a determination of whether it's necessary (why would AFS's RX care about the internals of DNS packets?) or not. --- nameser.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'nameser.h') diff --git a/nameser.h b/nameser.h index 68aeff17..52c31481 100644 --- a/nameser.h +++ b/nameser.h @@ -1,4 +1,4 @@ -/* @(#) $Header: /tcpdump/master/tcpdump/nameser.h,v 1.7 2001-02-20 06:31:34 itojun Exp $ (LBL) */ +/* @(#) $Header: /tcpdump/master/tcpdump/nameser.h,v 1.8 2001-06-26 06:19:03 guy Exp $ (LBL) */ /* * Copyright (c) 1983, 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -95,6 +95,20 @@ #define ZONEINIT 0xe /* initial zone transfer */ #define ZONEREF 0xf /* incremental zone referesh */ +/* + * Undefine various #defines from various System V-flavored OSes (Solaris, + * SINIX) so the compiler doesn't whine that we redefine them. + */ +#ifdef T_OPT +#undef T_OPT +#endif +#ifdef T_UNSPEC +#undef T_UNSPEC +#endif +#ifdef NOERROR +#undef NOERROR +#endif + /* * Currently defined response codes */ -- cgit v1.2.1