From 699fc31439c6d227def4f2fdf7b4f4c5f3d02828 Mon Sep 17 00:00:00 2001
From: Bill Fenner <fenner@FreeBSD.org>
Date: Tue, 15 Sep 1998 19:46:59 +0000
Subject: Merge tcpdump 3.4

PR:		bin/7877
---
 contrib/tcpdump/print-arp.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'contrib/tcpdump/print-arp.c')

diff --git a/contrib/tcpdump/print-arp.c b/contrib/tcpdump/print-arp.c
index c9533c73ff9b..c7578feed2e4 100644
--- a/contrib/tcpdump/print-arp.c
+++ b/contrib/tcpdump/print-arp.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-arp.c,v 1.41 96/10/27 14:54:50 leres Exp $ (LBL)";
+    "@(#) $Header: print-arp.c,v 1.43 97/06/15 13:20:27 leres Exp $ (LBL)";
 #endif
 
 #include <sys/param.h>
@@ -38,6 +38,9 @@ struct rtentry;
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
+#ifdef HAVE_MEMORY_H
+#include <memory.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 
-- 
cgit v1.2.3