[vlc-devel] commit: Remove useless <fcntl.h> inclusions ( Rémi Denis-Courmont )
git version control
git at videolan.org
Mon Jan 11 19:20:07 CET 2010
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jan 11 19:37:21 2010 +0200| [e7ee6a9d861ea4f62a828ebd929f8ecd15b4163f] | committer: Rémi Denis-Courmont
Remove useless <fcntl.h> inclusions
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e7ee6a9d861ea4f62a828ebd929f8ecd15b4163f
---
modules/access/alsa.c | 1 -
modules/access/dv.c | 7 -------
modules/access/dvb/access.c | 3 +--
modules/access/dvb/en50221.c | 1 -
modules/access/dvb/http.c | 1 -
modules/access/dvb/scan.c | 1 -
modules/access/dvdread.c | 1 -
modules/access/mms/mmstu.c | 6 ------
modules/access_output/udp.c | 1 -
modules/control/http/http.h | 4 ----
modules/control/http/mvar.c | 1 +
modules/control/http/util.c | 1 +
modules/control/telnet.c | 5 -----
modules/gui/skins2/x11/x11_timer.cpp | 1 -
modules/stream_out/rtp.c | 1 -
.../dynamicoverlay/dynamicoverlay_list.c | 1 -
src/extras/libc.c | 1 -
src/misc/messages.c | 4 ----
src/misc/objects.c | 1 -
src/network/httpd.c | 4 ----
src/network/tcp.c | 6 ------
test/dynamicoverlay/overlay-test.c | 1 -
22 files changed, 3 insertions(+), 50 deletions(-)
diff --git a/modules/access/alsa.c b/modules/access/alsa.c
index a86054d..08a661e 100644
--- a/modules/access/alsa.c
+++ b/modules/access/alsa.c
@@ -45,7 +45,6 @@
#include <vlc_demux.h>
#include <vlc_input.h>
-#include <fcntl.h>
#include <unistd.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
diff --git a/modules/access/dv.c b/modules/access/dv.c
index 2007951..e75e87d 100644
--- a/modules/access/dv.c
+++ b/modules/access/dv.c
@@ -36,13 +36,6 @@
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( WIN32 ) && !defined( UNDER_CE )
diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index c4b7338..bf628b4 100644
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -42,9 +42,8 @@
# include <unistd.h>
#endif
-#include <fcntl.h>
#include <sys/types.h>
-#include <sys/poll.h>
+#include <poll.h>
#include <errno.h>
diff --git a/modules/access/dvb/en50221.c b/modules/access/dvb/en50221.c
index c3504ac..6a24fce 100644
--- a/modules/access/dvb/en50221.c
+++ b/modules/access/dvb/en50221.c
@@ -33,7 +33,6 @@
#include <errno.h>
#include <sys/types.h>
-#include <fcntl.h>
#include <time.h>
#include <unistd.h>
#include <poll.h>
diff --git a/modules/access/dvb/http.c b/modules/access/dvb/http.c
index f79216d..159a0d7 100644
--- a/modules/access/dvb/http.c
+++ b/modules/access/dvb/http.c
@@ -35,7 +35,6 @@
# include <unistd.h>
#endif
-#include <fcntl.h>
#include <sys/types.h>
/* Include dvbpsi headers */
diff --git a/modules/access/dvb/scan.c b/modules/access/dvb/scan.c
index f41364d..5ee7be9 100644
--- a/modules/access/dvb/scan.c
+++ b/modules/access/dvb/scan.c
@@ -36,7 +36,6 @@
# include <unistd.h>
#endif
-#include <fcntl.h>
#include <sys/types.h>
#include <poll.h>
diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 8b4a05b..641fab5 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -46,7 +46,6 @@
# include <unistd.h>
#endif
-#include <fcntl.h>
#include <sys/types.h>
#ifdef HAVE_DVDREAD_DVD_READER_H
diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index ce2d921..12fb209 100644
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -38,12 +38,6 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c
index afb9bf1..21ff9a4 100644
--- a/modules/access_output/udp.c
+++ b/modules/access_output/udp.c
@@ -33,7 +33,6 @@
#include <vlc_plugin.h>
#include <sys/types.h>
-#include <fcntl.h>
#include <assert.h>
#include <vlc_sout.h>
diff --git a/modules/control/http/http.h b/modules/control/http/http.h
index 1ea3726..99b8346 100644
--- a/modules/control/http/http.h
+++ b/modules/control/http/http.h
@@ -44,10 +44,6 @@
#include <vlc_acl.h>
#include <vlc_charset.h>
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( WIN32 ) && !defined( UNDER_CE )
diff --git a/modules/control/http/mvar.c b/modules/control/http/mvar.c
index 13a5b98..28862cd 100644
--- a/modules/control/http/mvar.c
+++ b/modules/control/http/mvar.c
@@ -30,6 +30,7 @@
#include <limits.h>
#include <errno.h>
#include <ctype.h>
+#include <fcntl.h>
/* Utility function for scandir */
static int Filter( const char *foo )
diff --git a/modules/control/http/util.c b/modules/control/http/util.c
index 7f21ebc..17e9115 100644
--- a/modules/control/http/util.c
+++ b/modules/control/http/util.c
@@ -31,6 +31,7 @@
#include "http.h"
#include <vlc_strings.h>
#include <errno.h>
+#include <fcntl.h>
/****************************************************************************
* File and directory functions
diff --git a/modules/control/telnet.c b/modules/control/telnet.c
index c2370cb..0b63fd1 100644
--- a/modules/control/telnet.c
+++ b/modules/control/telnet.c
@@ -38,11 +38,6 @@
#include <stdbool.h>
#include <errno.h>
-#include <fcntl.h>
-
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
diff --git a/modules/gui/skins2/x11/x11_timer.cpp b/modules/gui/skins2/x11/x11_timer.cpp
index 1719748..3e0a553 100644
--- a/modules/gui/skins2/x11/x11_timer.cpp
+++ b/modules/gui/skins2/x11/x11_timer.cpp
@@ -25,7 +25,6 @@
#ifdef X11_SKINS
#include <unistd.h>
-#include <fcntl.h>
#include <poll.h>
#include "x11_timer.hpp"
diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 1f6ee72..d78a12d 100644
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -49,7 +49,6 @@
#ifdef HAVE_UNISTD_H
# include <sys/types.h>
# include <unistd.h>
-# include <fcntl.h>
#endif
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c b/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c
index 06d4170..66ad130 100644
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c
+++ b/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c
@@ -30,7 +30,6 @@
#include <vlc_osd.h>
#include <vlc_memory.h>
-#include <fcntl.h>
#include "dynamicoverlay.h"
/*****************************************************************************
diff --git a/src/extras/libc.c b/src/extras/libc.c
index 738ed49..f262b7d 100644
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -50,7 +50,6 @@
# include <unistd.h>
# include <errno.h>
# include <sys/wait.h>
-# include <fcntl.h>
# include <sys/socket.h>
# include <sys/poll.h>
# ifndef PF_LOCAL
diff --git a/src/misc/messages.c b/src/misc/messages.c
index 62d5b7c..30cb004 100644
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -36,10 +36,6 @@
#include <stdarg.h> /* va_list for BSD */
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h> /* O_CREAT, O_TRUNC, O_WRONLY, O_SYNC */
-#endif
-
#include <errno.h> /* errno */
#ifdef WIN32
diff --git a/src/misc/objects.c b/src/misc/objects.c
index f7eb7db..59391df 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -50,7 +50,6 @@
# include <unistd.h>
#else
# include <io.h>
-# include <fcntl.h>
#endif
#include <search.h>
diff --git a/src/network/httpd.c b/src/network/httpd.c
index 4b50568..cad49ed 100644
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -45,10 +45,6 @@
# include <unistd.h>
#endif
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-
#ifdef HAVE_POLL
# include <poll.h>
#endif
diff --git a/src/network/tcp.c b/src/network/tcp.c
index 0347010..cd5fa02 100644
--- a/src/network/tcp.c
+++ b/src/network/tcp.c
@@ -35,12 +35,6 @@
#include <errno.h>
#include <assert.h>
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
diff --git a/test/dynamicoverlay/overlay-test.c b/test/dynamicoverlay/overlay-test.c
index 63774d5..e2761e5 100644
--- a/test/dynamicoverlay/overlay-test.c
+++ b/test/dynamicoverlay/overlay-test.c
@@ -31,7 +31,6 @@
#include <string.h>
#include <math.h>
-#include <sys/fcntl.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <unistd.h>
More information about the vlc-devel
mailing list