From: Guy Harris <guy@alum.mit.edu>
Date: Sun, 4 May 2014 17:08:44 +0000 (-0700)
Subject: Include <errno.h> on both Windows and UN*X.
X-Git-Tag: tcpdump-4.6.0~34
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/27991a20a82e8dbdfff5cfcf7678ac751c641384

Include <errno.h> on both Windows and UN*X.

We need <errno.h> on UN*X in some files that include tcpdump-stdinc.h,
such as missing/inet_pton.c.

Remove includes of <errno.h> from files that include tcpdump-stdinc.h.
---

diff --git a/missing/inet_ntop.c b/missing/inet_ntop.c
index 57539dc5..8c6f7eb8 100644
--- a/missing/inet_ntop.c
+++ b/missing/inet_ntop.c
@@ -43,7 +43,6 @@
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
-#include <errno.h>
 
 /*
  *
diff --git a/tcpdump-stdinc.h b/tcpdump-stdinc.h
index 5e5773b7..32f8fc92 100644
--- a/tcpdump-stdinc.h
+++ b/tcpdump-stdinc.h
@@ -39,6 +39,8 @@
 #ifndef tcpdump_stdinc_h
 #define tcpdump_stdinc_h
 
+#include <errno.h>
+
 #ifdef WIN32
 
 #include <stdint.h>
@@ -49,7 +51,6 @@
 #include <ctype.h>
 #include <time.h>
 #include <io.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <net/netdb.h>  /* in wpcap's Win32/include */
diff --git a/tcpdump.c b/tcpdump.c
index f1ed46e0..fc86d32b 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -73,7 +73,6 @@ extern int SIZE_BUF;
 #include <sys/resource.h>
 #include <pwd.h>
 #include <grp.h>
-#include <errno.h>
 #endif /* WIN32 */
 
 /* capabilities convinience library */
diff --git a/util.c b/util.c
index 13c87225..12a15023 100644
--- a/util.c
+++ b/util.c
@@ -28,7 +28,6 @@
 
 #include <sys/stat.h>
 
-#include <errno.h>
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif