Module Name: src
Committed By: christos
Date: Mon Dec 24 02:39:12 UTC 2018
Modified Files:
src/external/bsd/tcpdump/dist: tcpdump.c
Log Message:
make pcap_debug weak.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/tcpdump/dist/tcpdump.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tcpdump/dist/tcpdump.c
diff -u src/external/bsd/tcpdump/dist/tcpdump.c:1.16 src/external/bsd/tcpdump/dist/tcpdump.c:1.17
--- src/external/bsd/tcpdump/dist/tcpdump.c:1.16 Fri Sep 8 10:01:13 2017
+++ src/external/bsd/tcpdump/dist/tcpdump.c Sun Dec 23 21:39:12 2018
@@ -30,7 +30,7 @@
static const char copyright[] _U_ =
"@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
The Regents of the University of California. All rights reserved.\n";
-__RCSID("$NetBSD: tcpdump.c,v 1.16 2017/09/08 14:01:13 christos Exp $");
+__RCSID("$NetBSD: tcpdump.c,v 1.17 2018/12/24 02:39:12 christos Exp $");
#endif
/*
@@ -261,9 +261,10 @@ static void
pcap_set_parser_debug(int value)
{
#ifdef HAVE_PCAP_DEBUG
- extern int pcap_debug;
+ extern int pcap_debug __weak;
- pcap_debug = value;
+ if (&pcap_debug)
+ pcap_debug = value;
#else /* HAVE_PCAP_DEBUG */
extern int yydebug;
