diff options
| -rw-r--r-- | lib/libpcap/etherent.c | 3 | ||||
| -rw-r--r-- | lib/libpcap/gencode.c | 4 | ||||
| -rw-r--r-- | lib/libpcap/inet.c | 3 | ||||
| -rw-r--r-- | lib/libpcap/nametoaddr.c | 4 | ||||
| -rw-r--r-- | lib/libpcap/optimize.c | 4 | ||||
| -rw-r--r-- | lib/libpcap/savefile.c | 4 |
6 files changed, 10 insertions, 12 deletions
diff --git a/lib/libpcap/etherent.c b/lib/libpcap/etherent.c index 5ca0184b3ae..3911a11e78f 100644 --- a/lib/libpcap/etherent.c +++ b/lib/libpcap/etherent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: etherent.c,v 1.7 2004/01/27 06:58:03 tedu Exp $ */ +/* $OpenBSD: etherent.c,v 1.8 2015/11/17 18:19:45 mmcc Exp $ */ /* * Copyright (c) 1990, 1993, 1994, 1995, 1996 @@ -24,7 +24,6 @@ #include <sys/types.h> #include <ctype.h> -#include <memory.h> #include <stdio.h> #include <string.h> diff --git a/lib/libpcap/gencode.c b/lib/libpcap/gencode.c index 51e30ab8490..eac4e0426a6 100644 --- a/lib/libpcap/gencode.c +++ b/lib/libpcap/gencode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gencode.c,v 1.41 2015/09/27 05:25:00 guenther Exp $ */ +/* $OpenBSD: gencode.c,v 1.42 2015/11/17 18:19:45 mmcc Exp $ */ /* * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998 @@ -42,9 +42,9 @@ struct rtentry; #include <stdlib.h> #include <stddef.h> -#include <memory.h> #include <setjmp.h> #include <stdarg.h> +#include <string.h> #include "pcap-int.h" diff --git a/lib/libpcap/inet.c b/lib/libpcap/inet.c index 6d4955594f8..72fd1c4bb4f 100644 --- a/lib/libpcap/inet.c +++ b/lib/libpcap/inet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet.c,v 1.21 2015/10/24 05:26:00 mmcc Exp $ */ +/* $OpenBSD: inet.c,v 1.22 2015/11/17 18:19:45 mmcc Exp $ */ /* * Copyright (c) 1994, 1995, 1996, 1997, 1998 @@ -50,7 +50,6 @@ struct rtentry; #include <ctype.h> #include <errno.h> -#include <memory.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/lib/libpcap/nametoaddr.c b/lib/libpcap/nametoaddr.c index 9013d68bb94..5d84ef2b50f 100644 --- a/lib/libpcap/nametoaddr.c +++ b/lib/libpcap/nametoaddr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nametoaddr.c,v 1.17 2015/10/24 06:07:43 mmcc Exp $ */ +/* $OpenBSD: nametoaddr.c,v 1.18 2015/11/17 18:19:45 mmcc Exp $ */ /* * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996 @@ -40,9 +40,9 @@ struct rtentry; #include <ctype.h> #include <errno.h> #include <stdlib.h> -#include <memory.h> #include <netdb.h> #include <stdio.h> +#include <string.h> #include "pcap-int.h" diff --git a/lib/libpcap/optimize.c b/lib/libpcap/optimize.c index 16b19f1b67b..44381a25be4 100644 --- a/lib/libpcap/optimize.c +++ b/lib/libpcap/optimize.c @@ -1,4 +1,4 @@ -/* $OpenBSD: optimize.c,v 1.15 2014/06/26 04:03:33 lteo Exp $ */ +/* $OpenBSD: optimize.c,v 1.16 2015/11/17 18:19:45 mmcc Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994, 1995, 1996 @@ -29,7 +29,7 @@ #include <stdio.h> #include <stdlib.h> #include <stdint.h> -#include <memory.h> +#include <string.h> #include "pcap-int.h" diff --git a/lib/libpcap/savefile.c b/lib/libpcap/savefile.c index c9b79c991bd..b956bb04515 100644 --- a/lib/libpcap/savefile.c +++ b/lib/libpcap/savefile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: savefile.c,v 1.13 2015/01/16 03:19:57 lteo Exp $ */ +/* $OpenBSD: savefile.c,v 1.14 2015/11/17 18:19:45 mmcc Exp $ */ /* * Copyright (c) 1993, 1994, 1995, 1996, 1997 @@ -34,9 +34,9 @@ #include <sys/time.h> #include <errno.h> -#include <memory.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <unistd.h> #ifdef HAVE_OS_PROTO_H |