Commit c4199ab6 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove inconsistently used HAVE_UNISTD_H

parent dd1ffcd3
...@@ -27,9 +27,7 @@ ...@@ -27,9 +27,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef HAVE_UNISTD_H #include <unistd.h>
# include <unistd.h>
#endif
#include <dirent.h> #include <dirent.h>
DIR *fdopendir (int fd) DIR *fdopendir (int fd)
......
...@@ -37,12 +37,8 @@ ...@@ -37,12 +37,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_UNISTD_H #include <unistd.h>
# include <unistd.h> #include <fcntl.h>
# include <fcntl.h>
#elif defined( _WIN32 )
# include <io.h>
#endif
#include <vlc_fs.h> #include <vlc_fs.h>
#include <vlc_url.h> #include <vlc_url.h>
......
...@@ -34,12 +34,7 @@ ...@@ -34,12 +34,7 @@
#include <errno.h> #include <errno.h>
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_UNISTD_H #include <unistd.h>
# include <unistd.h>
#elif defined( _WIN32 )
# include <io.h>
#endif
#include <sys/poll.h> #include <sys/poll.h>
#include <libraw1394/raw1394.h> #include <libraw1394/raw1394.h>
......
...@@ -38,9 +38,7 @@ ...@@ -38,9 +38,7 @@
#endif #endif
#include <assert.h> #include <assert.h>
#ifdef HAVE_UNISTD_H #include <unistd.h>
# include <unistd.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
......
...@@ -50,11 +50,8 @@ ...@@ -50,11 +50,8 @@
#include "../demux/ps.h" #include "../demux/ps.h"
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h>
#include <dvdread/dvd_reader.h> #include <dvdread/dvd_reader.h>
#include <dvdread/ifo_types.h> #include <dvdread/ifo_types.h>
......
...@@ -35,10 +35,8 @@ ...@@ -35,10 +35,8 @@
#include <errno.h> #include <errno.h>
#include <assert.h> #include <assert.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h>
#ifdef HAVE_POLL #ifdef HAVE_POLL
# include <poll.h> # include <poll.h>
#endif #endif
......
...@@ -42,10 +42,8 @@ ...@@ -42,10 +42,8 @@
# define INCL_DOSDEVIOCTL # define INCL_DOSDEVIOCTL
#endif #endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef HAVE_ARPA_INET_H #ifdef HAVE_ARPA_INET_H
......
...@@ -48,11 +48,7 @@ See http://www.vdr-wiki.de/ and http://www.tvdr.de/ for more information. ...@@ -48,11 +48,7 @@ See http://www.vdr-wiki.de/ and http://www.tvdr.de/ for more information.
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef HAVE_UNISTD_H #include <unistd.h>
# include <unistd.h>
#elif defined( _WIN32 )
# include <io.h>
#endif
#include <ctype.h> #include <ctype.h>
#include <time.h> #include <time.h>
......
...@@ -34,9 +34,7 @@ ...@@ -34,9 +34,7 @@
#include <time.h> #include <time.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_UNISTD_H #include <unistd.h>
# include <unistd.h>
#endif
#include <vlc_common.h> #include <vlc_common.h>
#include <vlc_plugin.h> #include <vlc_plugin.h>
......
...@@ -33,16 +33,13 @@ ...@@ -33,16 +33,13 @@
#include <vlc_plugin.h> #include <vlc_plugin.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h>
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <vlc_sout.h> #include <vlc_sout.h>
#include <vlc_block.h> #include <vlc_block.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#ifdef _WIN32 #ifdef _WIN32
# include <winsock2.h> # include <winsock2.h>
# include <ws2tcpip.h> # include <ws2tcpip.h>
......
...@@ -31,10 +31,6 @@ ...@@ -31,10 +31,6 @@
#include <math.h> /* sqrt */ #include <math.h> /* sqrt */
#include <stdint.h> /* int16_t .. */ #include <stdint.h> /* int16_t .. */
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <vlc_common.h> #include <vlc_common.h>
#include <vlc_plugin.h> #include <vlc_plugin.h>
#include <vlc_block.h> #include <vlc_block.h>
......
...@@ -28,9 +28,7 @@ ...@@ -28,9 +28,7 @@
#include <vlc_codec.h> #include <vlc_codec.h>
#include <vlc_dialog.h> #include <vlc_dialog.h>
#ifdef HAVE_UNISTD_H #include <unistd.h>
# include <unistd.h>
#endif
#ifdef _POSIX_VERSION #ifdef _POSIX_VERSION
# include <glob.h> # include <glob.h>
#endif #endif
......
...@@ -36,10 +36,8 @@ ...@@ -36,10 +36,8 @@
#include <vlc_input.h> #include <vlc_input.h>
#include <vlc_playlist.h> #include <vlc_playlist.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h>
#ifdef HAVE_POLL #ifdef HAVE_POLL
# include <poll.h> # include <poll.h>
#endif #endif
......
...@@ -44,10 +44,8 @@ ...@@ -44,10 +44,8 @@
#include <vlc_playlist.h> #include <vlc_playlist.h>
#include <vlc_keys.h> #include <vlc_keys.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h>
#include <vlc_network.h> #include <vlc_network.h>
#include <vlc_url.h> #include <vlc_url.h>
......
...@@ -28,9 +28,7 @@ ...@@ -28,9 +28,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef HAVE_UNISTD_H #include <unistd.h>
# include <unistd.h>
#endif
#include <vlc_common.h> #include <vlc_common.h>
#include <vlc_fs.h> #include <vlc_fs.h>
......
...@@ -25,11 +25,7 @@ ...@@ -25,11 +25,7 @@
#include "os_factory.hpp" #include "os_factory.hpp"
#include "../commands/async_queue.hpp" #include "../commands/async_queue.hpp"
#include "../commands/cmd_dialogs.hpp" #include "../commands/cmd_dialogs.hpp"
#ifdef HAVE_UNISTD_H #include <unistd.h>
# include <unistd.h>
#elif defined( _WIN32 )
# include <direct.h>
#endif
#include <fstream> #include <fstream>
......
...@@ -34,11 +34,9 @@ ...@@ -34,11 +34,9 @@
#include <vlc_services_discovery.h> #include <vlc_services_discovery.h>
#include <vlc_playlist.h> #include <vlc_playlist.h>
#include <vlc_network.h> #include <vlc_network.h>
#include <assert.h>
#ifdef HAVE_UNISTD_H #include <assert.h>
# include <unistd.h> #include <unistd.h>
#endif
/************************************************************************ /************************************************************************
* Macros and definitions * Macros and definitions
......
...@@ -41,9 +41,7 @@ ...@@ -41,9 +41,7 @@
#include <vlc_charset.h> #include <vlc_charset.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_UNISTD_H #include <unistd.h>
# include <unistd.h>
#endif
#ifdef HAVE_ARPA_INET_H #ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h> # include <arpa/inet.h>
#endif #endif
......
...@@ -48,10 +48,8 @@ ...@@ -48,10 +48,8 @@
#include "rtp.h" #include "rtp.h"
#ifdef HAVE_UNISTD_H #include <sys/types.h>
# include <sys/types.h> #include <unistd.h>
# include <unistd.h>
#endif
#ifdef HAVE_ARPA_INET_H #ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h> # include <arpa/inet.h>
#endif #endif
...@@ -683,9 +681,7 @@ static void Close( vlc_object_t * p_this ) ...@@ -683,9 +681,7 @@ static void Close( vlc_object_t * p_this )
if( p_sys->psz_sdp_file != NULL ) if( p_sys->psz_sdp_file != NULL )
{ {
#ifdef HAVE_UNISTD_H
unlink( p_sys->psz_sdp_file ); unlink( p_sys->psz_sdp_file );
#endif
free( p_sys->psz_sdp_file ); free( p_sys->psz_sdp_file );
} }
free( p_sys->psz_vod_session ); free( p_sys->psz_vod_session );
......
...@@ -35,12 +35,7 @@ ...@@ -35,12 +35,7 @@
#include <vlc_filter.h> #include <vlc_filter.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( _WIN32 )
# include <io.h>
#endif
#include <glib.h> #include <glib.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
......
...@@ -35,9 +35,7 @@ ...@@ -35,9 +35,7 @@
#elif defined(HAVE_USELOCALE) #elif defined(HAVE_USELOCALE)
#include <locale.h> #include <locale.h>
#endif #endif
#ifdef HAVE_UNISTD_H #include <unistd.h>
# include <unistd.h>
#endif
#include <vlc_common.h> #include <vlc_common.h>
#include "../libvlc.h" #include "../libvlc.h"
......
...@@ -35,9 +35,7 @@ ...@@ -35,9 +35,7 @@
# include <direct.h> # include <direct.h>
#endif #endif
#include <sys/stat.h> #include <sys/stat.h>
#ifdef HAVE_UNISTD_H #include <unistd.h>
# include <unistd.h>
#endif
#include <vlc_common.h> #include <vlc_common.h>
#include <vlc_fs.h> #include <vlc_fs.h>
......
...@@ -32,9 +32,7 @@ ...@@ -32,9 +32,7 @@
#endif #endif
#include <ctype.h> /* isalnum() */ #include <ctype.h> /* isalnum() */
#ifdef HAVE_UNISTD_H #include <unistd.h>
# include <unistd.h>
#endif
#include <sys/stat.h> #include <sys/stat.h>
#include <vlc_common.h> #include <vlc_common.h>
......
...@@ -38,9 +38,6 @@ ...@@ -38,9 +38,6 @@
#endif #endif
#include <assert.h> #include <assert.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <vlc_common.h> #include <vlc_common.h>
#include <vlc_modules.h> #include <vlc_modules.h>
......
...@@ -31,9 +31,7 @@ ...@@ -31,9 +31,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_UNISTD_H #include <unistd.h>
# include <unistd.h>
#endif
#include <fcntl.h> #include <fcntl.h>
#include <vlc_common.h> #include <vlc_common.h>
......
...@@ -36,9 +36,7 @@ ...@@ -36,9 +36,7 @@
#include <vlc_common.h> #include <vlc_common.h>
#include <assert.h> #include <assert.h>
#ifdef HAVE_UNISTD_H #include <unistd.h>
# include <unistd.h>
#endif
#if !defined (_POSIX_TIMERS) || defined (_WIN32) #if !defined (_POSIX_TIMERS) || defined (_WIN32)
# define _POSIX_TIMERS (-1) # define _POSIX_TIMERS (-1)
#endif #endif
......
...@@ -35,9 +35,7 @@ ...@@ -35,9 +35,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef HAVE_UNISTD_H #include <unistd.h>
# include <unistd.h>
#endif
#include <vlc_common.h> #include <vlc_common.h>
#include <vlc_plugin.h> #include <vlc_plugin.h>
......
...@@ -33,9 +33,7 @@ ...@@ -33,9 +33,7 @@
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef HAVE_UNISTD_H #include <unistd.h>
# include <unistd.h>
#endif
#include <assert.h> #include <assert.h>
#include <vlc_common.h> #include <vlc_common.h>
......
...@@ -44,10 +44,7 @@ ...@@ -44,10 +44,7 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <unistd.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#ifdef HAVE_POLL #ifdef HAVE_POLL
# include <poll.h> # include <poll.h>
......
...@@ -42,9 +42,7 @@ ...@@ -42,9 +42,7 @@
#include <assert.h> #include <assert.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef HAVE_UNISTD_H #include <unistd.h>
# include <unistd.h>
#endif
#ifdef HAVE_POLL #ifdef HAVE_POLL
# include <poll.h> # include <poll.h>
#endif #endif
......
...@@ -34,10 +34,7 @@ ...@@ -34,10 +34,7 @@
#include <errno.h> #include <errno.h>
#include <assert.h> #include <assert.h>
#include <unistd.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#ifdef HAVE_POLL #ifdef HAVE_POLL
# include <poll.h> # include <poll.h>
#endif #endif
......
...@@ -38,9 +38,7 @@ ...@@ -38,9 +38,7 @@
#include <errno.h> #include <errno.h>
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef HAVE_UNISTD_H #include <unistd.h>
# include <unistd.h>
#endif
/** /**
* Opens a FILE pointer. * Opens a FILE pointer.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment