We use GLib's directory-reading routines, so we don't need <dire[cn]t.h>.

Change-Id: Id86e5d6d0ab24adb1bfff0688f33a40f2fdaed8d
Reviewed-on: https://code.wireshark.org/review/7108
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>

8 files changed, 1 insertions, 32 deletions

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 911d487cb7..a743425191 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -25,8 +25,6 @@ include(CMakePushCheckState)
 include(CheckIncludeFile)
 check_include_file("arpa/inet.h"         HAVE_ARPA_INET_H)
 check_include_file("arpa/nameser.h"      HAVE_ARPA_NAMESER_H)
-check_include_file("direct.h"            HAVE_DIRECT_H)
-check_include_file("dirent.h"            HAVE_DIRENT_H)
 check_include_file("dlfcn.h"             HAVE_DLFCN_H)
 check_include_file("fcntl.h"             HAVE_FCNTL_H)
 check_include_file("getopt.h"            HAVE_GETOPT_H)
diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index fcf18e4d0d..213a5851ba 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -47,12 +47,6 @@
 /* Define to use c-ares library */
 #cmakedefine HAVE_C_ARES 1
 
-/* Define to 1 if you have the <direct.h> header file. */
-#cmakedefine HAVE_DIRECT_H 1
-
-/* Define to 1 if you have the <dirent.h> header file. */
-#cmakedefine HAVE_DIRENT_H 1
-
 /* Define to 1 if you have the `dladdr' function. */
 #cmakedefine HAVE_DLADDR 1
 
diff --git a/config.h.win32 b/config.h.win32
index 549a1885aa..403ee9fd29 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -98,9 +98,6 @@
 /* Define if you have the <arpa/inet.h> header file.  */
 /* #undef HAVE_ARPA_INET_H */
 
-/* Define if you have the <direct.h> header file.  */
-#define HAVE_DIRECT_H 1
-
 /* Define if you have the <fcntl.h> header file.  */
 #define HAVE_FCNTL_H 1
 
diff --git a/configure.ac b/configure.ac
index 3ca13aebf1..4e866dc073 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2537,7 +2537,7 @@ AC_SUBST(LIBCAP_LIBS)
 
 dnl Checks for header files.
 dnl Some of these may not be needed: http://hacks.owlfolio.org/header-survey/
-AC_CHECK_HEADERS(direct.h dirent.h fcntl.h getopt.h grp.h inttypes.h netdb.h pwd.h stdarg.h stddef.h unistd.h)
+AC_CHECK_HEADERS(fcntl.h getopt.h grp.h inttypes.h netdb.h pwd.h stdarg.h stddef.h unistd.h)
 AC_CHECK_HEADERS(sys/ioctl.h sys/param.h sys/socket.h sys/sockio.h sys/stat.h sys/time.h sys/types.h sys/utsname.h sys/wait.h)
 AC_CHECK_HEADERS(netinet/in.h)
 AC_CHECK_HEADERS(arpa/inet.h arpa/nameser.h)
diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c
index c54553a891..5f493b3fb0 100644
--- a/epan/dissectors/packet-xml.c
+++ b/epan/dissectors/packet-xml.c
@@ -27,10 +27,6 @@
 
 #include "config.h"
 
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-
 #include <string.h>
 #include <errno.h>
 
diff --git a/fileset.c b/fileset.c
index 4c23790bb9..4066718ee1 100644
--- a/fileset.c
+++ b/fileset.c
@@ -30,10 +30,6 @@
 #include <fcntl.h>
 #endif
 
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c
index 68a9ef2a17..16e51615b1 100644
--- a/wsutil/filesystem.c
+++ b/wsutil/filesystem.c
@@ -29,10 +29,6 @@
  */
 #define _GNU_SOURCE
 
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/wsutil/plugins.c b/wsutil/plugins.c
index 18b4776da4..4ab167a1a2 100644
--- a/wsutil/plugins.c
+++ b/wsutil/plugins.c
@@ -26,14 +26,6 @@
 
 #include <time.h>
 
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-
-#ifdef HAVE_DIRECT_H
-#include <direct.h>
-#endif
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>