Remove inconsistently used HAVE_UNISTD_H
authorRémi Denis-Courmont <remi@remlab.net>
Sun, 29 Dec 2013 14:15:46 +0000 (16:15 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Sun, 29 Dec 2013 14:15:46 +0000 (16:15 +0200)
32 files changed:
compat/fdopendir.c
modules/access/directory.c
modules/access/dv.c
modules/access/dvdnav.c
modules/access/dvdread.c
modules/access/mms/mmstu.c
modules/access/vcd/cdrom.c
modules/access/vdr.c
modules/access_output/livehttp.c
modules/access_output/udp.c
modules/audio_filter/channel_mixer/mono.c
modules/codec/fluidsynth.c
modules/control/netsync.c
modules/control/rc.c
modules/gui/skins2/src/theme_loader.cpp
modules/gui/skins2/src/theme_repository.cpp
modules/services_discovery/podcast.c
modules/services_discovery/sap.c
modules/stream_out/rtp.c
modules/text_renderer/svg.c
src/config/file.c
src/input/es_out_timeshift.c
src/input/subtitles.c
src/interface/interface.c
src/misc/block.c
src/misc/mtime.c
src/modules/bank.c
src/modules/cache.c
src/network/httpd.c
src/network/io.c
src/network/tcp.c
src/text/filesystem.c

index 0c6b625..6e59796 100644 (file)
@@ -27,9 +27,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <dirent.h>
 
 DIR *fdopendir (int fd)
index c18bc5b..3d72dc0 100644 (file)
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#   include <fcntl.h>
-#elif defined( _WIN32 )
-#   include <io.h>
-#endif
+#include <unistd.h>
+#include <fcntl.h>
 
 #include <vlc_fs.h>
 #include <vlc_url.h>
index 5fa6b69..f7792b8 100644 (file)
 
 #include <errno.h>
 #include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#elif defined( _WIN32 )
-#   include <io.h>
-#endif
-
+#include <unistd.h>
 #include <sys/poll.h>
 
 #include <libraw1394/raw1394.h>
index 002fb38..e5a81d3 100644 (file)
@@ -38,9 +38,7 @@
 #endif
 
 #include <assert.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
index bfefb1e..9b0c40f 100644 (file)
 
 #include "../demux/ps.h"
 
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
-
 #include <sys/types.h>
+#include <unistd.h>
 
 #include <dvdread/dvd_reader.h>
 #include <dvdread/ifo_types.h>
index 0c052dc..6091fbd 100644 (file)
 #include <errno.h>
 #include <assert.h>
 
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
 #include <sys/types.h>
+#include <unistd.h>
 #ifdef HAVE_POLL
 #   include <poll.h>
 #endif
index 17ce5ed..e536315 100644 (file)
 #   define INCL_DOSDEVIOCTL
 #endif
 
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
 #include <sys/types.h>
+#include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #ifdef HAVE_ARPA_INET_H
index 6ff3c46..20ecba7 100644 (file)
@@ -48,11 +48,7 @@ See http://www.vdr-wiki.de/ and http://www.tvdr.de/ for more information.
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#elif defined( _WIN32 )
-#   include <io.h>
-#endif
+#include <unistd.h>
 
 #include <ctype.h>
 #include <time.h>
index 4fab13d..26f510c 100644 (file)
@@ -34,9 +34,7 @@
 #include <time.h>
 #include <fcntl.h>
 #include <errno.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
index 89be3b0..2ce33a5 100644 (file)
 #include <vlc_plugin.h>
 
 #include <sys/types.h>
+#include <unistd.h>
 #include <assert.h>
 #include <errno.h>
 
 #include <vlc_sout.h>
 #include <vlc_block.h>
 
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
-
 #ifdef _WIN32
 #   include <winsock2.h>
 #   include <ws2tcpip.h>
index 4ccbf51..bafda10 100644 (file)
 #include <math.h>                                        /* sqrt */
 #include <stdint.h>                                         /* int16_t .. */
 
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
-
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_block.h>
index 49d5ab1..fe065d6 100644 (file)
@@ -28,9 +28,7 @@
 #include <vlc_codec.h>
 #include <vlc_dialog.h>
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #ifdef _POSIX_VERSION
 # include <glob.h>
 #endif
index 7466025..565d472 100644 (file)
 #include <vlc_input.h>
 #include <vlc_playlist.h>
 
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
 #include <sys/types.h>
+#include <unistd.h>
 #ifdef HAVE_POLL
 #   include <poll.h>
 #endif
index 4abb70c..1da5440 100644 (file)
 #include <vlc_playlist.h>
 #include <vlc_keys.h>
 
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
 #include <sys/types.h>
+#include <unistd.h>
 
 #include <vlc_network.h>
 #include <vlc_url.h>
index e224364..866f4b4 100644 (file)
@@ -28,9 +28,7 @@
 
 #include <fcntl.h>
 #include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+#include <unistd.h>
 
 #include <vlc_common.h>
 #include <vlc_fs.h>
index 7f7dfe6..b908b5a 100644 (file)
 #include "os_factory.hpp"
 #include "../commands/async_queue.hpp"
 #include "../commands/cmd_dialogs.hpp"
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#elif defined( _WIN32 )
-#   include <direct.h>
-#endif
+#include <unistd.h>
 
 #include <fstream>
 
index 28bad18..3f4f5d2 100644 (file)
 #include <vlc_services_discovery.h>
 #include <vlc_playlist.h>
 #include <vlc_network.h>
-#include <assert.h>
 
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
+#include <assert.h>
+#include <unistd.h>
 
 /************************************************************************
  * Macros and definitions
index 554c08e..5376106 100644 (file)
@@ -41,9 +41,7 @@
 #include <vlc_charset.h>
 
 #include <errno.h>
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
+#include <unistd.h>
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
index 68a5f07..1aa868b 100644 (file)
 
 #include "rtp.h"
 
-#ifdef HAVE_UNISTD_H
-#   include <sys/types.h>
-#   include <unistd.h>
-#endif
+#include <sys/types.h>
+#include <unistd.h>
 #ifdef HAVE_ARPA_INET_H
 #   include <arpa/inet.h>
 #endif
@@ -683,9 +681,7 @@ static void Close( vlc_object_t * p_this )
 
     if( p_sys->psz_sdp_file != NULL )
     {
-#ifdef HAVE_UNISTD_H
         unlink( p_sys->psz_sdp_file );
-#endif
         free( p_sys->psz_sdp_file );
     }
     free( p_sys->psz_vod_session );
index c30223f..49f0557 100644 (file)
 #include <vlc_filter.h>
 
 #include <sys/types.h>
-
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#elif defined( _WIN32 )
-#   include <io.h>
-#endif
+#include <unistd.h>
 
 #include <glib.h>
 #include <glib/gstdio.h>
index 8fec5c1..7bab109 100644 (file)
@@ -35,9 +35,7 @@
 #elif defined(HAVE_USELOCALE)
 #include <locale.h>
 #endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #include <vlc_common.h>
 #include "../libvlc.h"
index 9c57832..72ed0d2 100644 (file)
@@ -35,9 +35,7 @@
 #  include <direct.h>
 #endif
 #include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #include <vlc_common.h>
 #include <vlc_fs.h>
index 5a1a981..5a686ba 100644 (file)
@@ -32,9 +32,7 @@
 #endif
 
 #include <ctype.h> /* isalnum() */
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+#include <unistd.h>
 #include <sys/stat.h>
 
 #include <vlc_common.h>
index 2350538..57c88f6 100644 (file)
@@ -38,9 +38,6 @@
 #endif
 
 #include <assert.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 
 #include <vlc_common.h>
 #include <vlc_modules.h>
index a7dfed9..3e953f1 100644 (file)
@@ -31,9 +31,7 @@
 #include <sys/stat.h>
 #include <assert.h>
 #include <errno.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <fcntl.h>
 
 #include <vlc_common.h>
index 06fa3b9..4bc2db2 100644 (file)
@@ -36,9 +36,7 @@
 #include <vlc_common.h>
 #include <assert.h>
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #if !defined (_POSIX_TIMERS) || defined (_WIN32)
 # define _POSIX_TIMERS (-1)
 #endif
index ea3ee5d..ba2593b 100644 (file)
@@ -35,9 +35,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+#include <unistd.h>
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
index ddf3f98..f94d091 100644 (file)
@@ -33,9 +33,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+#include <unistd.h>
 #include <assert.h>
 
 #include <vlc_common.h>
index 53b7511..ca41d27 100644 (file)
 
 #include <string.h>
 #include <errno.h>
-
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+#include <unistd.h>
 
 #ifdef HAVE_POLL
 # include <poll.h>
index abf07a4..d8832e2 100644 (file)
@@ -42,9 +42,7 @@
 #include <assert.h>
 
 #include <fcntl.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+#include <unistd.h>
 #ifdef HAVE_POLL
 #   include <poll.h>
 #endif
index d968ae8..083861d 100644 (file)
 
 #include <errno.h>
 #include <assert.h>
-
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+#include <unistd.h>
 #ifdef HAVE_POLL
 # include <poll.h>
 #endif
index f3eb1d7..981a053 100644 (file)
@@ -38,9 +38,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <fcntl.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 /**
  * Opens a FILE pointer.