osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Eliminate some unneeded header checks. 

sys/stat.h and sys/types.h date back to V7 UNIX, so they should be
present on all UN*Xes, and we're assuming they're available on Windows,
so, unless and until we ever support platforms that are neither UN*Xes
nor Windows, we don't need to check for them.

Remove the CMake checks for them, remove the HAVE_ values from
cmakeconfig.h.in, and remove all tests for the HAVE_ values.

Change-Id: I90bb2aab37958553673b03b52f4931d3b304b9d0
Reviewed-on: https://code.wireshark.org/review/27603
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2018-05-16 12:51:45 -07:00
parent 054a7e4606
commit d08d0a87c5
19 changed files with 7 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -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)

2
ConfigureChecks.cmake
View File

@ -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)

4
capture_opts.h
View File

@ -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>

4
caputils/capture-pcap-util.c
View File

@ -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>

6
cmakeconfig.h.in
View File

@ -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

4
dumpcap.c
View File

@ -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>

4
epan/tap.c
View File

@ -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>

2
extcap.c
View File

@ -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

4
file.c
View File

@ -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>

2
ui/qt/interface_toolbar_reader.cpp
View File

@ -9,9 +9,7 @@
#include "config.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>

2
wiretap/mime_file.c
View File

@ -18,9 +18,7 @@
#include "config.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>

2
wiretap/mp2t.c
View File

@ -10,9 +10,7 @@
#include "config.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>

2
wiretap/mpeg.c
View File

@ -10,9 +10,7 @@
#include "config.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>

2
wiretap/nettrace_3gpp_32_423.c
View File

@ -10,9 +10,7 @@
#include "config.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>

2
wiretap/wtap.c
View File

@ -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"

2
wsutil/file_util.h
View File

@ -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

2
wsutil/inet_addr.c
View File

@ -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 */

4
wsutil/interface.c
View File

@ -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>

4
wsutil/privileges.c
View File

@ -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>