[vlc-devel] commit: Remove sys/types.h check ( Rémi Denis-Courmont )

git version control git at videolan.org
Sat Jan 16 13:15:58 CET 2010 

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jan 16 14:13:50 2010 +0200| [a6d927b07acefa4eb7cc2b936e1d76d7416aee98] | committer: Rémi Denis-Courmont 

Remove sys/types.h check

We assume it is present in plenty of places anyway

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

 configure.ac                           |    2 +-
 modules/access/directory.c             |    4 +---
 modules/access/dv.c                    |    4 +---
 modules/access/dvdnav.c                |    4 +---
 modules/access/file.c                  |    4 +---
 modules/access/mms/mmstu.c             |    4 +---
 modules/access/mtp.c                   |    4 +---
 modules/access/vcd/cdrom.c             |    4 +---
 modules/control/netsync.c              |    4 +---
 modules/demux/mp4/drms.c               |    4 +---
 modules/demux/subtitle.c               |    3 ---
 modules/demux/subtitle_asa.c           |    4 ----
 modules/misc/dummy/decoder.c           |    4 +---
 modules/misc/svg.c                     |    4 +---
 src/control/mediacontrol_audio_video.c |    4 +---
 src/control/mediacontrol_core.c        |    4 +---
 src/control/mediacontrol_util.c        |    4 +---
 src/modules/cache.c                    |    4 +---
 src/modules/modules.c                  |    4 +---
 src/modules/os.c                       |    4 +---
 src/network/getaddrinfo.c              |    4 +---
 21 files changed, 19 insertions(+), 62 deletions(-)

diff --git a/configure.ac b/configure.ac
index 618d6f0..e9f5679 100644
--- a/configure.ac
+++ b/configure.ac
@@ -842,7 +842,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
 
 dnl Check for headers
 AC_CHECK_HEADERS(getopt.h strings.h locale.h xlocale.h)
-AC_CHECK_HEADERS(fcntl.h sys/types.h sys/time.h sys/ioctl.h sys/stat.h sys/mount.h)
+AC_CHECK_HEADERS(fcntl.h sys/time.h sys/ioctl.h sys/stat.h sys/mount.h)
 AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h sys/eventfd.h])
 AC_CHECK_HEADERS([net/if.h], [], [],
   [
diff --git a/modules/access/directory.c b/modules/access/directory.c
index feb655e..2e1d75a 100644
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -34,9 +34,7 @@
 #include "fs.h"
 #include <vlc_access.h>
 
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#endif
+#include <sys/types.h>
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
 #endif
diff --git a/modules/access/dv.c b/modules/access/dv.c
index e75e87d..16d28af 100644
--- a/modules/access/dv.c
+++ b/modules/access/dv.c
@@ -33,9 +33,7 @@
 #include <vlc_access.h>
 
 #include <errno.h>
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#endif
+#include <sys/types.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 d157893..3fb79f2 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -42,9 +42,7 @@
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#endif
+#include <sys/types.h>
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
 #endif
diff --git a/modules/access/file.c b/modules/access/file.c
index 74d0639..de42c39 100644
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -35,9 +35,7 @@
 
 #include <assert.h>
 #include <errno.h>
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#endif
+#include <sys/types.h>
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
 #endif
diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index 065d5b3..e2bc5f0 100644
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -38,9 +38,7 @@
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#endif
+#include <sys/types.h>
 #ifdef HAVE_POLL
 #   include <poll.h>
 #endif
diff --git a/modules/access/mtp.c b/modules/access/mtp.c
index 91cd884..9e35be8 100644
--- a/modules/access/mtp.c
+++ b/modules/access/mtp.c
@@ -38,9 +38,7 @@
 
 #include <assert.h>
 #include <errno.h>
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#endif
+#include <sys/types.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 78246ea..765f6c5 100644
--- a/modules/access/vcd/cdrom.c
+++ b/modules/access/vcd/cdrom.c
@@ -39,9 +39,7 @@
 #   include <unistd.h>
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#endif
+#include <sys/types.h>
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
 #endif
diff --git a/modules/control/netsync.c b/modules/control/netsync.c
index 5652d0e..118255e 100644
--- a/modules/control/netsync.c
+++ b/modules/control/netsync.c
@@ -37,9 +37,7 @@
 #ifdef HAVE_UNISTD_H
 #    include <unistd.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#endif
+#include <sys/types.h>
 #ifdef HAVE_POLL
 #   include <poll.h>
 #endif
diff --git a/modules/demux/mp4/drms.c b/modules/demux/mp4/drms.c
index 4f78415..3050e19 100644
--- a/modules/demux/mp4/drms.c
+++ b/modules/demux/mp4/drms.c
@@ -51,9 +51,7 @@
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#endif
+#include <sys/types.h>
 
 /* In Solaris (and perhaps others) PATH_MAX is in limits.h. */
 #include <limits.h>
diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c
index ce97012..d461106 100644
--- a/modules/demux/subtitle.c
+++ b/modules/demux/subtitle.c
@@ -36,9 +36,6 @@
 #include <vlc_input.h>
 #include <vlc_memory.h>
 
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#endif
 #include <ctype.h>
 
 #include <vlc_demux.h>
diff --git a/modules/demux/subtitle_asa.c b/modules/demux/subtitle_asa.c
index c634c51..3a6716c 100644
--- a/modules/demux/subtitle_asa.c
+++ b/modules/demux/subtitle_asa.c
@@ -35,10 +35,6 @@
 #include <vlc_input.h>
 #include <vlc_memory.h>
 
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#endif
-
 #include <vlc_demux.h>
 #include <vlc_charset.h>
 
diff --git a/modules/misc/dummy/decoder.c b/modules/misc/dummy/decoder.c
index d4eb09f..d63df18 100644
--- a/modules/misc/dummy/decoder.c
+++ b/modules/misc/dummy/decoder.c
@@ -32,14 +32,12 @@
 #include <vlc_codec.h>
 #include <vlc_charset.h>
 
+#include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h> /* write(), close() */
 #elif defined( WIN32 ) && !defined( UNDER_CE )
 #   include <io.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h> /* open() */
-#endif
 #ifdef HAVE_FCNTL_H
 #   include <fcntl.h>
 #endif
diff --git a/modules/misc/svg.c b/modules/misc/svg.c
index 2f3ee44..a7380cb 100644
--- a/modules/misc/svg.c
+++ b/modules/misc/svg.c
@@ -37,9 +37,7 @@
 #include <vlc_block.h>
 #include <vlc_filter.h>
 
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#endif
+#include <sys/types.h>
 
 #ifdef HAVE_UNISTD_H
 #    include <unistd.h>
diff --git a/src/control/mediacontrol_audio_video.c b/src/control/mediacontrol_audio_video.c
index cc3ac9c..6efa684 100644
--- a/src/control/mediacontrol_audio_video.c
+++ b/src/control/mediacontrol_audio_video.c
@@ -44,9 +44,7 @@
 #ifdef HAVE_UNISTD_H
 #    include <unistd.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#    include <sys/types.h>
-#endif
+#include <sys/types.h>
 
 mediacontrol_RGBPicture *
 mediacontrol_snapshot( mediacontrol_Instance *self,
diff --git a/src/control/mediacontrol_core.c b/src/control/mediacontrol_core.c
index 7d73a60..e6af12f 100644
--- a/src/control/mediacontrol_core.c
+++ b/src/control/mediacontrol_core.c
@@ -46,9 +46,7 @@
 #ifdef HAVE_UNISTD_H
 #    include <unistd.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#    include <sys/types.h>
-#endif
+#include <sys/types.h>
 
 mediacontrol_Instance* mediacontrol_new( int argc, char** argv, mediacontrol_Exception *exception )
 {
diff --git a/src/control/mediacontrol_util.c b/src/control/mediacontrol_util.c
index 7b4ac52..b34dfa3 100644
--- a/src/control/mediacontrol_util.c
+++ b/src/control/mediacontrol_util.c
@@ -40,9 +40,7 @@
 #ifdef HAVE_UNISTD_H
 #    include <unistd.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#    include <sys/types.h>
-#endif
+#include <sys/types.h>
 
 libvlc_time_t private_mediacontrol_unit_convert( libvlc_media_player_t *p_media_player,
                                                  mediacontrol_PositionKey from,
diff --git a/src/modules/cache.c b/src/modules/cache.c
index 1477f97..089f4aa 100644
--- a/src/modules/cache.c
+++ b/src/modules/cache.c
@@ -37,9 +37,7 @@
 #include <vlc_plugin.h>
 #include <vlc_cpu.h>
 
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#endif
+#include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
diff --git a/src/modules/modules.c b/src/modules/modules.c
index f2fd417..a06c290 100644
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -42,9 +42,7 @@
 #   include <dirent.h>
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#endif
+#include <sys/types.h>
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
 #endif
diff --git a/src/modules/os.c b/src/modules/os.c
index 63df567..cc33c51 100644
--- a/src/modules/os.c
+++ b/src/modules/os.c
@@ -38,9 +38,7 @@
 #include <stdio.h>                                              /* sprintf() */
 #include <string.h>                                              /* strdup() */
 
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#endif
+#include <sys/types.h>
 
 #if !defined(HAVE_DYNAMIC_PLUGINS)
     /* no support for plugins */
diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c
index dcea956..7d56c2d 100644
--- a/src/network/getaddrinfo.c
+++ b/src/network/getaddrinfo.c
@@ -35,9 +35,7 @@
 #include <errno.h>
 #include <assert.h>
 
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#endif
+#include <sys/types.h>
 #ifdef HAVE_ARPA_INET_H
 #   include <arpa/inet.h>
 #endif

More information about the vlc-devel mailing list