vlc | branch: master | KO Myung-Hun <[email protected]> | Fri Oct 14 21:51:05 2011 +0900| [3d5dcf8b0ca969c9dd095f657bafe9062fb9702f] | committer: Rémi Denis-Courmont
Include missing unistd.h and time.h for OS/2 Modified-by: Rémi Denis-Courmont <[email protected]> Signed-off-by: Rémi Denis-Courmont <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3d5dcf8b0ca969c9dd095f657bafe9062fb9702f --- modules/access/file.c | 2 -- modules/access_output/livehttp.c | 3 +++ modules/control/motion.c | 1 + modules/misc/audioscrobbler.c | 2 ++ modules/stream_out/rtsp.c | 1 + .../video_filter/dynamicoverlay/dynamicoverlay.c | 1 + src/config/file.c | 3 +++ src/input/es_out_timeshift.c | 3 +++ src/input/item.c | 1 + src/interface/interface.c | 4 ++++ src/misc/block.c | 4 ++++ src/misc/objects.c | 1 + src/text/filesystem.c | 3 +++ src/video_output/video_epg.c | 2 ++ 14 files changed, 29 insertions(+), 2 deletions(-) diff --git a/modules/access/file.c b/modules/access/file.c index be9044d..92c0411 100644 --- a/modules/access/file.c +++ b/modules/access/file.c @@ -59,8 +59,6 @@ # include <ctype.h> # include <shlwapi.h> # include <vlc_charset.h> -#elif defined( __OS2__ ) -# include <ctype.h> #else # include <unistd.h> #endif diff --git a/modules/access_output/livehttp.c b/modules/access_output/livehttp.c index 52a383d..d335a64 100644 --- a/modules/access_output/livehttp.c +++ b/modules/access_output/livehttp.c @@ -33,6 +33,9 @@ #include <time.h> #include <fcntl.h> #include <errno.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif #include <vlc_common.h> #include <vlc_plugin.h> diff --git a/modules/control/motion.c b/modules/control/motion.c index 6b620f3..b234f5c 100644 --- a/modules/control/motion.c +++ b/modules/control/motion.c @@ -31,6 +31,7 @@ #endif #include <math.h> +#include <unistd.h> #include <vlc_common.h> #include <vlc_plugin.h> diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c index 1c31af4..33c1238 100644 --- a/modules/misc/audioscrobbler.c +++ b/modules/misc/audioscrobbler.c @@ -36,6 +36,8 @@ # include "config.h" #endif +#include <time.h> + #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_interface.h> diff --git a/modules/stream_out/rtsp.c b/modules/stream_out/rtsp.c index b7fee37..783bda4 100644 --- a/modules/stream_out/rtsp.c +++ b/modules/stream_out/rtsp.c @@ -43,6 +43,7 @@ #include <assert.h> #include <errno.h> #include <stdlib.h> +#include <time.h> #ifndef WIN32 # include <locale.h> diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay.c b/modules/video_filter/dynamicoverlay/dynamicoverlay.c index 52dba04..c7079a0 100644 --- a/modules/video_filter/dynamicoverlay/dynamicoverlay.c +++ b/modules/video_filter/dynamicoverlay/dynamicoverlay.c @@ -39,6 +39,7 @@ #include <ctype.h> #include <fcntl.h> #include <errno.h> +#include <unistd.h> #include "dynamicoverlay.h" diff --git a/src/config/file.c b/src/config/file.c index 81b8f3a..84528e1 100644 --- a/src/config/file.c +++ b/src/config/file.c @@ -35,6 +35,9 @@ #elif defined(HAVE_USELOCALE) #include <locale.h> #endif +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif #include <vlc_common.h> #include "../libvlc.h" diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c index fc45bd9..891bba1 100644 --- a/src/input/es_out_timeshift.c +++ b/src/input/es_out_timeshift.c @@ -37,6 +37,9 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif #include <vlc_common.h> #include <vlc_fs.h> diff --git a/src/input/item.c b/src/input/item.c index 13a1202..58cfc46 100644 --- a/src/input/item.c +++ b/src/input/item.c @@ -25,6 +25,7 @@ # include "config.h" #endif #include <assert.h> +#include <time.h> #include <vlc_common.h> #include <vlc_url.h> diff --git a/src/interface/interface.c b/src/interface/interface.c index 17ca466..124d5cd 100644 --- a/src/interface/interface.c +++ b/src/interface/interface.c @@ -38,6 +38,10 @@ #endif #include <assert.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif + #include <vlc_common.h> #include <vlc_modules.h> #include <vlc_interface.h> diff --git a/src/misc/block.c b/src/misc/block.c index a37e7fd..d399c4a 100644 --- a/src/misc/block.c +++ b/src/misc/block.c @@ -32,6 +32,10 @@ #include <sys/stat.h> #include <assert.h> #include <errno.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif + #include "vlc_block.h" /** diff --git a/src/misc/objects.c b/src/misc/objects.c index 07336fa..22ac9bc 100644 --- a/src/misc/objects.c +++ b/src/misc/objects.c @@ -55,6 +55,7 @@ #ifdef __OS2__ # include <sys/socket.h> # include <netinet/in.h> +# include <unistd.h> // close(), write() #elif defined(WIN32) # include <io.h> # include <winsock2.h> diff --git a/src/text/filesystem.c b/src/text/filesystem.c index d71c099..78f088e 100644 --- a/src/text/filesystem.c +++ b/src/text/filesystem.c @@ -38,6 +38,9 @@ #include <errno.h> #include <sys/types.h> #include <fcntl.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif /** * Opens a FILE pointer. diff --git a/src/video_output/video_epg.c b/src/video_output/video_epg.c index 05116a4..d25ced1 100644 --- a/src/video_output/video_epg.c +++ b/src/video_output/video_epg.c @@ -24,6 +24,8 @@ # include "config.h" #endif +#include <time.h> + #include <vlc_common.h> #include <vlc_vout.h> #include <vlc_vout_osd.h> _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
