summaryrefslogtreecommitdiffstats
path: root/contrib/tcpdump/print-ntp.c
diff options
context:
space:
mode:
authorfenner <fenner@FreeBSD.org>1998-09-15 19:46:59 +0000
committerfenner <fenner@FreeBSD.org>1998-09-15 19:46:59 +0000
commit03014afd0377fb8957d9c87572c96a6096b14d45 (patch)
tree06d0bbbc70fe36db13ceefd086607351b3abea15 /contrib/tcpdump/print-ntp.c
parent577b5b88b39bedc51620403e37d7e98cceb75351 (diff)
downloadFreeBSD-src-03014afd0377fb8957d9c87572c96a6096b14d45.zip
FreeBSD-src-03014afd0377fb8957d9c87572c96a6096b14d45.tar.gz
Merge tcpdump 3.4
PR: bin/7877
Diffstat (limited to 'contrib/tcpdump/print-ntp.c')
-rw-r--r--contrib/tcpdump/print-ntp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/tcpdump/print-ntp.c b/contrib/tcpdump/print-ntp.c
index 926691c..696bb42 100644
--- a/contrib/tcpdump/print-ntp.c
+++ b/contrib/tcpdump/print-ntp.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996
+ * Copyright (c) 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
@@ -25,7 +25,7 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: print-ntp.c,v 1.25 96/11/05 13:30:37 leres Exp $ (LBL)";
+ "@(#) $Header: print-ntp.c,v 1.26 97/06/13 12:56:37 leres Exp $ (LBL)";
#endif
#include <sys/param.h>
@@ -47,7 +47,9 @@ struct rtentry;
#include "interface.h"
#include "addrtoname.h"
+#ifdef MODEMASK
#undef MODEMASK /* Solaris sucks */
+#endif
#include "ntp.h"
static void p_sfix(const struct s_fixedpt *);
OpenPOWER on IntegriCloud