From a6d927b07acefa4eb7cc2b936e1d76d7416aee98 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 16 Jan 2010 14:13:50 +0200 Subject: [PATCH] Remove sys/types.h check We assume it is present in plenty of places anyway --- 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 618d6f08de..e9f5679fe3 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 feb655e259..2e1d75a645 100644 --- a/modules/access/directory.c +++ b/modules/access/directory.c @@ -34,9 +34,7 @@ #include "fs.h" #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include #ifdef HAVE_SYS_STAT_H # include #endif diff --git a/modules/access/dv.c b/modules/access/dv.c index e75e87d6b2..16d28af49d 100644 --- a/modules/access/dv.c +++ b/modules/access/dv.c @@ -33,9 +33,7 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include #ifdef HAVE_UNISTD_H # include #elif defined( WIN32 ) && !defined( UNDER_CE ) diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c index d157893d13..3fb79f246a 100644 --- a/modules/access/dvdnav.c +++ b/modules/access/dvdnav.c @@ -42,9 +42,7 @@ #ifdef HAVE_UNISTD_H # include #endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include #ifdef HAVE_SYS_STAT_H # include #endif diff --git a/modules/access/file.c b/modules/access/file.c index 74d0639fb9..de42c39d0d 100644 --- a/modules/access/file.c +++ b/modules/access/file.c @@ -35,9 +35,7 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include #ifdef HAVE_SYS_STAT_H # include #endif diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c index 065d5b3cbc..e2bc5f039d 100644 --- a/modules/access/mms/mmstu.c +++ b/modules/access/mms/mmstu.c @@ -38,9 +38,7 @@ #ifdef HAVE_UNISTD_H # include #endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include #ifdef HAVE_POLL # include #endif diff --git a/modules/access/mtp.c b/modules/access/mtp.c index 91cd8848ce..9e35be8e2c 100644 --- a/modules/access/mtp.c +++ b/modules/access/mtp.c @@ -38,9 +38,7 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include #ifdef HAVE_SYS_STAT_H # include #endif diff --git a/modules/access/vcd/cdrom.c b/modules/access/vcd/cdrom.c index 78246ea0af..765f6c561b 100644 --- a/modules/access/vcd/cdrom.c +++ b/modules/access/vcd/cdrom.c @@ -39,9 +39,7 @@ # include #endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include #ifdef HAVE_SYS_STAT_H # include #endif diff --git a/modules/control/netsync.c b/modules/control/netsync.c index 5652d0e15a..118255e3c7 100644 --- a/modules/control/netsync.c +++ b/modules/control/netsync.c @@ -37,9 +37,7 @@ #ifdef HAVE_UNISTD_H # include #endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include #ifdef HAVE_POLL # include #endif diff --git a/modules/demux/mp4/drms.c b/modules/demux/mp4/drms.c index 4f78415589..3050e19eed 100644 --- a/modules/demux/mp4/drms.c +++ b/modules/demux/mp4/drms.c @@ -51,9 +51,7 @@ #ifdef HAVE_SYS_STAT_H # include #endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include /* In Solaris (and perhaps others) PATH_MAX is in limits.h. */ #include diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c index ce97012366..d46110675b 100644 --- a/modules/demux/subtitle.c +++ b/modules/demux/subtitle.c @@ -36,9 +36,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif #include #include diff --git a/modules/demux/subtitle_asa.c b/modules/demux/subtitle_asa.c index c634c51319..3a6716c2b6 100644 --- a/modules/demux/subtitle_asa.c +++ b/modules/demux/subtitle_asa.c @@ -35,10 +35,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - #include #include diff --git a/modules/misc/dummy/decoder.c b/modules/misc/dummy/decoder.c index d4eb09f151..d63df18b39 100644 --- a/modules/misc/dummy/decoder.c +++ b/modules/misc/dummy/decoder.c @@ -32,14 +32,12 @@ #include #include +#include #ifdef HAVE_UNISTD_H # include /* write(), close() */ #elif defined( WIN32 ) && !defined( UNDER_CE ) # include #endif -#ifdef HAVE_SYS_TYPES_H -# include /* open() */ -#endif #ifdef HAVE_FCNTL_H # include #endif diff --git a/modules/misc/svg.c b/modules/misc/svg.c index 2f3ee44f74..a7380cbf4a 100644 --- a/modules/misc/svg.c +++ b/modules/misc/svg.c @@ -37,9 +37,7 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include #ifdef HAVE_UNISTD_H # include diff --git a/src/control/mediacontrol_audio_video.c b/src/control/mediacontrol_audio_video.c index cc3ac9cec0..6efa684f06 100644 --- a/src/control/mediacontrol_audio_video.c +++ b/src/control/mediacontrol_audio_video.c @@ -44,9 +44,7 @@ #ifdef HAVE_UNISTD_H # include #endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include mediacontrol_RGBPicture * mediacontrol_snapshot( mediacontrol_Instance *self, diff --git a/src/control/mediacontrol_core.c b/src/control/mediacontrol_core.c index 7d73a60060..e6af12fe73 100644 --- a/src/control/mediacontrol_core.c +++ b/src/control/mediacontrol_core.c @@ -46,9 +46,7 @@ #ifdef HAVE_UNISTD_H # include #endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include 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 7b4ac520c1..b34dfa38fe 100644 --- a/src/control/mediacontrol_util.c +++ b/src/control/mediacontrol_util.c @@ -40,9 +40,7 @@ #ifdef HAVE_UNISTD_H # include #endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include 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 1477f97e90..089f4aa842 100644 --- a/src/modules/cache.c +++ b/src/modules/cache.c @@ -37,9 +37,7 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include #ifdef HAVE_UNISTD_H # include #endif diff --git a/src/modules/modules.c b/src/modules/modules.c index f2fd4179a1..a06c290624 100644 --- a/src/modules/modules.c +++ b/src/modules/modules.c @@ -42,9 +42,7 @@ # include #endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include #ifdef HAVE_SYS_STAT_H # include #endif diff --git a/src/modules/os.c b/src/modules/os.c index 63df567bf1..cc33c51328 100644 --- a/src/modules/os.c +++ b/src/modules/os.c @@ -38,9 +38,7 @@ #include /* sprintf() */ #include /* strdup() */ -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include #if !defined(HAVE_DYNAMIC_PLUGINS) /* no support for plugins */ diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c index dcea956dc2..7d56c2dccf 100644 --- a/src/network/getaddrinfo.c +++ b/src/network/getaddrinfo.c @@ -35,9 +35,7 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include #ifdef HAVE_ARPA_INET_H # include #endif -- 2.39.2