From ad0c9114e00a9a30168e0c13c17d8f65571aa67f Mon Sep 17 00:00:00 2001
From: glebius <glebius@FreeBSD.org>
Date: Fri, 10 Feb 2017 07:22:12 +0000
Subject: Merge r309649, r313048, r313083, r313104:

  tcpdump 4.9.0
---
 contrib/tcpdump/nlpid.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'contrib/tcpdump/nlpid.c')

diff --git a/contrib/tcpdump/nlpid.c b/contrib/tcpdump/nlpid.c
index 919e87d..4b44ee1 100644
--- a/contrib/tcpdump/nlpid.c
+++ b/contrib/tcpdump/nlpid.c
@@ -13,13 +13,12 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
-#include "interface.h"
+#include <netdissect-stdinc.h>
+#include "netdissect.h"
 #include "nlpid.h"
 
 const struct tok nlpid_values[] = {
-- 
cgit v1.1