diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ConfigureChecks.cmake | 2 | ||||
| -rw-r--r-- | capture_opts.h | 4 | ||||
| -rw-r--r-- | caputils/capture-pcap-util.c | 4 | ||||
| -rw-r--r-- | cmakeconfig.h.in | 6 | ||||
| -rw-r--r-- | dumpcap.c | 4 | ||||
| -rw-r--r-- | epan/tap.c | 4 | ||||
| -rw-r--r-- | extcap.c | 2 | ||||
| -rw-r--r-- | file.c | 4 | ||||
| -rw-r--r-- | ui/qt/interface_toolbar_reader.cpp | 2 | ||||
| -rw-r--r-- | wiretap/mime_file.c | 2 | ||||
| -rw-r--r-- | wiretap/mp2t.c | 2 | ||||
| -rw-r--r-- | wiretap/mpeg.c | 2 | ||||
| -rw-r--r-- | wiretap/nettrace_3gpp_32_423.c | 2 | ||||
| -rw-r--r-- | wiretap/wtap.c | 2 | ||||
| -rw-r--r-- | wsutil/file_util.h | 2 | ||||
| -rw-r--r-- | wsutil/inet_addr.c | 2 | ||||
| -rw-r--r-- | wsutil/interface.c | 4 | ||||
| -rw-r--r-- | wsutil/privileges.c | 4 |
19 files changed, 7 insertions, 48 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5dcdceecd2..6a38731a49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,7 +127,6 @@ if(WIN32) # Prepopulate some ConfigureChecks values. Compilation checks # on Windows can be slow. set(HAVE_FCNTL_H TRUE) - set(HAVE_SYS_STAT_H TRUE) set(HAVE_FLOORL TRUE) set(HAVE_LRINT TRUE) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 8fdae65ad8..f6bf312b66 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -23,9 +23,7 @@ check_include_file("sys/ioctl.h" HAVE_SYS_IOCTL_H) check_include_file("sys/select.h" HAVE_SYS_SELECT_H) check_include_file("sys/socket.h" HAVE_SYS_SOCKET_H) check_include_file("sys/sockio.h" HAVE_SYS_SOCKIO_H) -check_include_file("sys/stat.h" HAVE_SYS_STAT_H) check_include_file("sys/time.h" HAVE_SYS_TIME_H) -check_include_file("sys/types.h" HAVE_SYS_TYPES_H) check_include_file("sys/utsname.h" HAVE_SYS_UTSNAME_H) check_include_file("sys/wait.h" HAVE_SYS_WAIT_H) check_include_file("unistd.h" HAVE_UNISTD_H) diff --git a/capture_opts.h b/capture_opts.h index 6e193cf6e3..9bbd3e8599 100644 --- a/capture_opts.h +++ b/capture_opts.h @@ -18,9 +18,7 @@ #ifndef __CAPTURE_OPTS_H__ #define __CAPTURE_OPTS_H__ -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> /* for gid_t */ -#endif +#include <sys/types.h> /* for gid_t */ #include <caputils/capture_ifinfo.h> diff --git a/caputils/capture-pcap-util.c b/caputils/capture-pcap-util.c index 2bc772068b..e2fa5c26b7 100644 --- a/caputils/capture-pcap-util.c +++ b/caputils/capture-pcap-util.c @@ -19,9 +19,7 @@ #include <limits.h> #include <string.h> -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif +#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index 57d7d59db1..360e0648fe 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -309,15 +309,9 @@ /* Define to 1 if you have the <sys/sockio.h> header file. */ #cmakedefine HAVE_SYS_SOCKIO_H 1 -/* Define to 1 if you have the <sys/stat.h> header file. */ -#cmakedefine HAVE_SYS_STAT_H 1 - /* Define to 1 if you have the <sys/time.h> header file. */ #cmakedefine HAVE_SYS_TIME_H 1 -/* Define to 1 if you have the <sys/types.h> header file. */ -#cmakedefine HAVE_SYS_TYPES_H 1 - /* Define to 1 if you have the <sys/utsname.h> header file. */ #cmakedefine HAVE_SYS_UTSNAME_H 1 @@ -15,9 +15,7 @@ #include <string.h> -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif +#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> diff --git a/epan/tap.c b/epan/tap.c index b431498fb0..5442a159ad 100644 --- a/epan/tap.c +++ b/epan/tap.c @@ -12,9 +12,7 @@ #include <stdio.h> -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif +#include <sys/types.h> #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> @@ -25,9 +25,7 @@ #include <unistd.h> #endif -#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> -#endif #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> #endif @@ -54,9 +54,7 @@ #include "ui/ws_ui_util.h" /* Needed for addrinfo */ -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif +#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> diff --git a/ui/qt/interface_toolbar_reader.cpp b/ui/qt/interface_toolbar_reader.cpp index 6a2fc745e4..d17899772b 100644 --- a/ui/qt/interface_toolbar_reader.cpp +++ b/ui/qt/interface_toolbar_reader.cpp @@ -9,9 +9,7 @@ #include "config.h" -#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> -#endif #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/wiretap/mime_file.c b/wiretap/mime_file.c index 7a47695f47..021f27a5e7 100644 --- a/wiretap/mime_file.c +++ b/wiretap/mime_file.c @@ -18,9 +18,7 @@ #include "config.h" -#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> -#endif #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/wiretap/mp2t.c b/wiretap/mp2t.c index 5d01b8f2e9..d374be8beb 100644 --- a/wiretap/mp2t.c +++ b/wiretap/mp2t.c @@ -10,9 +10,7 @@ #include "config.h" -#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> -#endif #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/wiretap/mpeg.c b/wiretap/mpeg.c index ed14e44615..2e2c47556d 100644 --- a/wiretap/mpeg.c +++ b/wiretap/mpeg.c @@ -10,9 +10,7 @@ #include "config.h" -#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> -#endif #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/wiretap/nettrace_3gpp_32_423.c b/wiretap/nettrace_3gpp_32_423.c index 4d72caeaf7..61c60e9add 100644 --- a/wiretap/nettrace_3gpp_32_423.c +++ b/wiretap/nettrace_3gpp_32_423.c @@ -10,9 +10,7 @@ #include "config.h" -#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> -#endif #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 2853923a72..7e55135e47 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -11,9 +11,7 @@ #include <string.h> #include <errno.h> -#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> -#endif #include "wtap-int.h" #include "wtap_opttypes.h" diff --git a/wsutil/file_util.h b/wsutil/file_util.h index fe2f7ba118..0f88eab746 100644 --- a/wsutil/file_util.h +++ b/wsutil/file_util.h @@ -32,9 +32,7 @@ extern "C" { #include <unistd.h> /* for read(), write(), close(), etc. */ #endif -#ifdef HAVE_SYS_STAT_H #include <sys/stat.h> /* for stat() and struct stat */ -#endif /* * Visual C++ on Win32 systems doesn't define these. (Old UNIX systems don't diff --git a/wsutil/inet_addr.c b/wsutil/inet_addr.c index 8f047721a7..e133b57834 100644 --- a/wsutil/inet_addr.c +++ b/wsutil/inet_addr.c @@ -17,9 +17,7 @@ #include <arpa/inet.h> #endif -#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> -#endif #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> /* needed to define AF_ values on UNIX */ diff --git a/wsutil/interface.c b/wsutil/interface.c index 0d9b282d00..98344d3437 100644 --- a/wsutil/interface.c +++ b/wsutil/interface.c @@ -17,9 +17,7 @@ #include <string.h> #include <wsutil/inet_addr.h> -#ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> -#endif +#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> diff --git a/wsutil/privileges.c b/wsutil/privileges.c index e1fef22026..7166b46c58 100644 --- a/wsutil/privileges.c +++ b/wsutil/privileges.c @@ -98,9 +98,7 @@ get_cur_groupname(void) { #else /* _WIN32 */ -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif +#include <sys/types.h> #ifdef HAVE_UNISTD_H #include <unistd.h> |