[vlc-commits] commit: Remove useless <dirent.h> check ( Rémi Denis-Courmont )
git at videolan.org
git at videolan.org
Tue Aug 3 18:21:39 CEST 2010
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Aug 3 19:00:32 2010 +0300| [1da8392047446063f48bfaa61c1dc08be4461df8] | committer: Rémi Denis-Courmont
Remove useless <dirent.h> check
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1da8392047446063f48bfaa61c1dc08be4461df8
---
configure.ac | 3 ---
modules/access/directory.c | 3 ---
modules/control/http/http.h | 4 ----
modules/demux/mkv/mkv.hpp | 4 ----
modules/gui/skins2/src/theme_loader.cpp | 5 -----
modules/gui/skins2/src/theme_repository.cpp | 3 ---
modules/misc/gnutls.c | 3 ---
src/extras/libc.c | 5 +----
src/input/subtitles.c | 4 ----
src/modules/modules.c | 4 ----
src/text/filesystem.c | 4 +---
11 files changed, 2 insertions(+), 40 deletions(-)
diff --git a/configure.ac b/configure.ac
index d9da6a9..e256ea0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -827,9 +827,6 @@ then
fi
])
-dnl Check for dirent
-AC_CHECK_HEADERS(dirent.h)
-
dnl Mac OS X and other OSes don't have declaration for nanosleep
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
AC_MSG_CHECKING(for nanosleep in time.h)
diff --git a/modules/access/directory.c b/modules/access/directory.c
index 121f622..b778cf0 100644
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -46,9 +46,6 @@
# include <io.h>
#endif
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#endif
#ifdef __sun__
static inline int dirfd (DIR *dir)
{
diff --git a/modules/control/http/http.h b/modules/control/http/http.h
index 0eb33f4..ebf1efa 100644
--- a/modules/control/http/http.h
+++ b/modules/control/http/http.h
@@ -49,10 +49,6 @@
# include <io.h>
#endif
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#endif
-
/* stat() support for large files on win32 */
#if defined( WIN32 ) && !defined( UNDER_CE )
# define stat _stati64
diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp
index 6b46c2a..296ef13 100644
--- a/modules/demux/mkv/mkv.hpp
+++ b/modules/demux/mkv/mkv.hpp
@@ -62,10 +62,6 @@
#include <vector>
#include <algorithm>
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#endif
-
/* libebml and matroska */
#include "ebml/EbmlHead.h"
#include "ebml/EbmlSubHead.h"
diff --git a/modules/gui/skins2/src/theme_loader.cpp b/modules/gui/skins2/src/theme_loader.cpp
index d1f76f2..7a67113 100644
--- a/modules/gui/skins2/src/theme_loader.cpp
+++ b/modules/gui/skins2/src/theme_loader.cpp
@@ -42,11 +42,6 @@
# include <direct.h>
#endif
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#endif
-
-
#if defined( HAVE_ZLIB_H )
# include <zlib.h>
# include <errno.h>
diff --git a/modules/gui/skins2/src/theme_repository.cpp b/modules/gui/skins2/src/theme_repository.cpp
index 1dc83b1..0e335c9 100644
--- a/modules/gui/skins2/src/theme_repository.cpp
+++ b/modules/gui/skins2/src/theme_repository.cpp
@@ -30,9 +30,6 @@
#elif defined( WIN32 ) && !defined( UNDER_CE )
# include <direct.h>
#endif
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#endif
#include <fstream>
diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index 5b7a82b..5c527d2 100644
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -36,9 +36,6 @@
#include <sys/types.h>
#include <errno.h>
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#endif
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
diff --git a/src/extras/libc.c b/src/extras/libc.c
index 1be7fe8..b0d17d1 100644
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -32,6 +32,7 @@
#include <vlc_common.h>
#include <errno.h>
+#include <dirent.h>
#undef iconv_t
#undef iconv_open
@@ -42,10 +43,6 @@
# include <iconv.h>
#endif
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#endif
-
#ifdef HAVE_FORK
# include <signal.h>
# include <unistd.h>
diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index 3881d2f..9c6843d 100644
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -35,10 +35,6 @@
#include <vlc_fs.h>
#include <vlc_url.h>
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#endif
-
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
diff --git a/src/modules/modules.c b/src/modules/modules.c
index 15feab1..f6f0e75 100644
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -39,10 +39,6 @@
#include <string.h> /* strdup() */
#include <assert.h>
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#endif
-
#include <sys/types.h>
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
diff --git a/src/text/filesystem.c b/src/text/filesystem.c
index d2f5324..e7a65b8 100644
--- a/src/text/filesystem.c
+++ b/src/text/filesystem.c
@@ -43,9 +43,7 @@
#endif
#include <errno.h>
#include <sys/types.h>
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#endif
+#include <dirent.h>
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
More information about the vlc-commits
mailing list