[vlc-commits] Remove inconsistently used check for <fcntl.h>

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Jan 27 23:03:23 2012 +0200| [2f1bcf5dc307eb36714cd0748caf86a8f9ecb23b] | committer: Rémi Denis-Courmont

Remove inconsistently used check for <fcntl.h>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2f1bcf5dc307eb36714cd0748caf86a8f9ecb23b
---

 configure.ac                            |    2 +-
 modules/access/dc1394.c                 |    4 +---
 modules/access/dvdnav.c                 |    4 +---
 modules/access/file.c                   |    4 +---
 modules/access/mtp.c                    |    4 +---
 modules/access/smb.c                    |    4 +---
 modules/access/vcd/cdrom.c              |    4 +---
 modules/access/vdr.c                    |    4 +---
 modules/gui/skins2/src/theme_loader.cpp |    4 +---
 src/network/io.c                        |    4 +---
 10 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/configure.ac b/configure.ac
index 85785c8..c0efd80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -666,7 +666,7 @@ fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
 dnl Check for headers
 AC_CHECK_HEADERS([search.h])
 AC_CHECK_HEADERS(getopt.h locale.h xlocale.h)
-AC_CHECK_HEADERS(fcntl.h sys/time.h sys/ioctl.h sys/stat.h)
+AC_CHECK_HEADERS([sys/time.h sys/ioctl.h sys/stat.h])
 AC_CHECK_HEADERS([arpa/inet.h netinet/udplite.h sys/eventfd.h])
 AC_CHECK_HEADERS([net/if.h], [], [],
   [
diff --git a/modules/access/dc1394.c b/modules/access/dc1394.c
index 7f53e42..83ddb92 100644
--- a/modules/access/dc1394.c
+++ b/modules/access/dc1394.c
@@ -39,9 +39,7 @@
 #include <vlc_fs.h>
 #include <vlc_picture.h>
 
-#ifdef HAVE_FCNTL_H
-#   include <fcntl.h>
-#endif
+#include <fcntl.h>
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #elif defined( WIN32 ) && !defined( UNDER_CE )
diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 381da51..e7f4a03 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -37,9 +37,7 @@
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
 #endif
-#ifdef HAVE_FCNTL_H
-#   include <fcntl.h>
-#endif
+#include <fcntl.h>
 #include <errno.h>
 
 #include <vlc_common.h>
diff --git a/modules/access/file.c b/modules/access/file.c
index e51e616..8f3a4a5 100644
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -33,9 +33,7 @@
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
 #endif
-#ifdef HAVE_FCNTL_H
-#   include <fcntl.h>
-#endif
+#include <fcntl.h>
 #ifdef HAVE_FSTATVFS
 #   include <sys/statvfs.h>
 #   if defined (HAVE_SYS_MOUNT_H)
diff --git a/modules/access/mtp.c b/modules/access/mtp.c
index fe094ec..e51f418 100644
--- a/modules/access/mtp.c
+++ b/modules/access/mtp.c
@@ -36,9 +36,7 @@
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
 #endif
-#ifdef HAVE_FCNTL_H
-#   include <fcntl.h>
-#endif
+#include <fcntl.h>
 #include <unistd.h>
 #include <poll.h>
 
diff --git a/modules/access/smb.c b/modules/access/smb.c
index 2bc7ab5..6ece3e0 100644
--- a/modules/access/smb.c
+++ b/modules/access/smb.c
@@ -30,9 +30,7 @@
 
 #include <errno.h>
 #ifdef WIN32
-#   ifdef HAVE_FCNTL_H
-#       include <fcntl.h>
-#   endif
+#   include <fcntl.h>
 #   ifdef HAVE_SYS_STAT_H
 #       include <sys/stat.h>
 #   endif
diff --git a/modules/access/vcd/cdrom.c b/modules/access/vcd/cdrom.c
index d417b28..0fd0263 100644
--- a/modules/access/vcd/cdrom.c
+++ b/modules/access/vcd/cdrom.c
@@ -41,9 +41,7 @@
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
 #endif
-#ifdef HAVE_FCNTL_H
-#   include <fcntl.h>
-#endif
+#include <fcntl.h>
 #ifdef HAVE_ARPA_INET_H
 #   include <arpa/inet.h>
 #endif
diff --git a/modules/access/vdr.c b/modules/access/vdr.c
index fbf1358..28edbbc 100644
--- a/modules/access/vdr.c
+++ b/modules/access/vdr.c
@@ -51,9 +51,7 @@ See http://www.vdr-wiki.de/ and http://www.tvdr.de/ for more information.
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
 #endif
-#ifdef HAVE_FCNTL_H
-#   include <fcntl.h>
-#endif
+#include <fcntl.h>
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #elif defined( WIN32 ) && !defined( UNDER_CE )
diff --git a/modules/gui/skins2/src/theme_loader.cpp b/modules/gui/skins2/src/theme_loader.cpp
index 06ffe36..d76eae5 100644
--- a/modules/gui/skins2/src/theme_loader.cpp
+++ b/modules/gui/skins2/src/theme_loader.cpp
@@ -26,9 +26,7 @@
 # include "config.h"
 #endif
 
-#ifdef HAVE_FCNTL_H
-#   include <fcntl.h>
-#endif
+#include <fcntl.h>
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
 #endif
diff --git a/src/network/io.c b/src/network/io.c
index b4b4196..0d89f10 100644
--- a/src/network/io.c
+++ b/src/network/io.c
@@ -41,9 +41,7 @@
 #include <errno.h>
 #include <assert.h>
 
-#ifdef HAVE_FCNTL_H
-#   include <fcntl.h>
-#endif
+#include <fcntl.h>
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif