diff options
| author | fenner <fenner@FreeBSD.org> | 1998-09-15 19:46:59 +0000 |
|---|---|---|
| committer | fenner <fenner@FreeBSD.org> | 1998-09-15 19:46:59 +0000 |
| commit | 03014afd0377fb8957d9c87572c96a6096b14d45 (patch) | |
| tree | 06d0bbbc70fe36db13ceefd086607351b3abea15 /contrib/tcpdump/print-udp.c | |
| parent | 577b5b88b39bedc51620403e37d7e98cceb75351 (diff) | |
| download | FreeBSD-src-03014afd0377fb8957d9c87572c96a6096b14d45.zip FreeBSD-src-03014afd0377fb8957d9c87572c96a6096b14d45.tar.gz | |
Merge tcpdump 3.4
PR: bin/7877
Diffstat (limited to 'contrib/tcpdump/print-udp.c')
| -rw-r--r-- | contrib/tcpdump/print-udp.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/contrib/tcpdump/print-udp.c b/contrib/tcpdump/print-udp.c index a0914eb..c75446f 100644 --- a/contrib/tcpdump/print-udp.c +++ b/contrib/tcpdump/print-udp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996 + * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: print-udp.c,v 1.58 96/12/10 23:22:07 leres Exp $ (LBL)"; + "@(#) $Header: print-udp.c,v 1.60 97/07/27 21:58:48 leres Exp $ (LBL)"; #endif #include <sys/param.h> @@ -35,9 +35,16 @@ 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 #include <arpa/tftp.h> #include <rpc/rpc.h> |
