Remove inconsistently used HAVE_UNISTD_H

diff --git a/compat/fdopendir.c b/compat/fdopendir.c
index 0c6b625985c3023200b193a0313d0a8af533bede..6e597963510d64e9511096098b0867a5cb3fde3b 100644 (file)
--- a/compat/fdopendir.c
+++ b/compat/fdopendir.c
@@ -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)

diff --git a/modules/access/directory.c b/modules/access/directory.c
index c18bc5bbcfe8c53b73e81bc77da55c1cb0460585..3d72dc09ab3944409f6e95e43fe91eb8dac9ba22 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -37,12 +37,8 @@
 #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>

diff --git a/modules/access/dv.c b/modules/access/dv.c
index 5fa6b69f6b47d4e64a6959a50dd084eb5ce8e56a..f7792b880561b80bc26d30a00983df1f92733b38 100644 (file)
--- a/modules/access/dv.c
+++ b/modules/access/dv.c
@@ -34,12 +34,7 @@
 
 #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>

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 002fb3824154e79271e819c66a4363d2e3043d2a..e5a81d3124e6bcab6bb17fa0c58090c010e18d2f 100644 (file)
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -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>

diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index bfefb1efdc846e2be0e7ad4519bdc5028e71116f..9b0c40f847a58c68e1e3bd644a399be60d16114d 100644 (file)
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -50,11 +50,8 @@
 
 #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>

diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index 0c052dc9686f00b99cf0f4e9df155ab56559cc0d..6091fbd274de57918fd53b1221963764f8e5c0dc 100644 (file)
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -35,10 +35,8 @@
 #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

diff --git a/modules/access/vcd/cdrom.c b/modules/access/vcd/cdrom.c
index 17ce5edd9dd1fdca1f354df932301b5eaf1f2a94..e536315a2c49ea2cc41d8ae0cf733560056fe9e3 100644 (file)
--- a/modules/access/vcd/cdrom.c
+++ b/modules/access/vcd/cdrom.c
@@ -42,10 +42,8 @@
 #   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

diff --git a/modules/access/vdr.c b/modules/access/vdr.c
index 6ff3c46186348d51ec6979b7fc2c427c48ae82f0..20ecba77854a303eadfc5e72695e4d01a92ee429 100644 (file)
--- a/modules/access/vdr.c
+++ b/modules/access/vdr.c
@@ -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>

diff --git a/modules/access_output/livehttp.c b/modules/access_output/livehttp.c
index 4fab13dcf59f3ff5fe6a12a9b6b3c0052a70b695..26f510ccef4448e649234921402a5530910f930a 100644 (file)
--- a/modules/access_output/livehttp.c
+++ b/modules/access_output/livehttp.c
@@ -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>

diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c
index 89be3b00c98c304d2023e18bb4e53d49f383e569..2ce33a503a32b1466f0cecca7dc17b28d842362c 100644 (file)
--- a/modules/access_output/udp.c
+++ b/modules/access_output/udp.c
@@ -33,16 +33,13 @@
 #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>

diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c
index 4ccbf51eeae1d95943920bcc6fdb79197f17de11..bafda1047d96b248d4318cee894973c104965e31 100644 (file)
--- a/modules/audio_filter/channel_mixer/mono.c
+++ b/modules/audio_filter/channel_mixer/mono.c
@@ -31,10 +31,6 @@
 #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>

diff --git a/modules/codec/fluidsynth.c b/modules/codec/fluidsynth.c
index 49d5ab146065198b3d1ab8fee992c5f4f1980076..fe065d67d7b7210651b4f5a4251deddd13605f4e 100644 (file)
--- a/modules/codec/fluidsynth.c
+++ b/modules/codec/fluidsynth.c
@@ -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

diff --git a/modules/control/netsync.c b/modules/control/netsync.c
index 7466025b6db5ea7ff13322273d78d86219e667a8..565d4728627ba41ca562e8f07890a69abb388965 100644 (file)
--- a/modules/control/netsync.c
+++ b/modules/control/netsync.c
@@ -36,10 +36,8 @@
 #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

diff --git a/modules/control/rc.c b/modules/control/rc.c
index 4abb70c9319e364a3dc9cedfc0bcf5e77eea3e34..1da54400cabf9df7f0f94e218f957d690ec1e167 100644 (file)
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -44,10 +44,8 @@
 #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>

diff --git a/modules/gui/skins2/src/theme_loader.cpp b/modules/gui/skins2/src/theme_loader.cpp
index e224364a1b8a7ef2dddeb9fa1d4aaaa618f58c66..866f4b4b74da830e2a3a3c674c82226f495a2a08 100644 (file)
--- a/modules/gui/skins2/src/theme_loader.cpp
+++ b/modules/gui/skins2/src/theme_loader.cpp
@@ -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>

diff --git a/modules/gui/skins2/src/theme_repository.cpp b/modules/gui/skins2/src/theme_repository.cpp
index 7f7dfe6467d06e0fdfe41dab6e97efada8edb662..b908b5a9f980a0109763b9699d1509b383d79a0c 100644 (file)
--- a/modules/gui/skins2/src/theme_repository.cpp
+++ b/modules/gui/skins2/src/theme_repository.cpp
@@ -25,11 +25,7 @@
 #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>
 

diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c
index 28bad18b399b689c3055c711c8b35952df3edbc7..3f4f5d21668c2c9efa9a51f0195b0a3264e7c3d9 100644 (file)
--- a/modules/services_discovery/podcast.c
+++ b/modules/services_discovery/podcast.c
@@ -34,11 +34,9 @@
 #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

diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index 554c08ecf9ccf38ee0646591d43fff702a1c4074..537610629e0dfcbc1a2a41e9e419bc402fb8ba5a 100644 (file)
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -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

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 68a5f07b91f1cfb2ccd4d34daa1342d1b2bf0c1f..1aa868b194197d7600517106a58d05208e48e8d5 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -48,10 +48,8 @@
 
 #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 );

diff --git a/modules/text_renderer/svg.c b/modules/text_renderer/svg.c
index c30223fd8e5e8cf1d566bfaf1d261e5e664e124a..49f0557b26566ee83aa4ecdf56ee69e7279c70c4 100644 (file)
--- a/modules/text_renderer/svg.c
+++ b/modules/text_renderer/svg.c
@@ -35,12 +35,7 @@
 #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>

diff --git a/src/config/file.c b/src/config/file.c
index 8fec5c113dd01631c68f86ea638e6f6a1556dc28..7bab109d00bf72c5ec02bf7c3eefa55a70315ed6 100644 (file)
--- a/src/config/file.c
+++ b/src/config/file.c
@@ -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"

diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c
index 9c57832b49ac35841aa51fb2dd8396e12bd34fe8..72ed0d27bbe0d3f0fd31c70249b2cd21900a9586 100644 (file)
--- a/src/input/es_out_timeshift.c
+++ b/src/input/es_out_timeshift.c
@@ -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>

diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index 5a1a981bd311848ac15377325c228d9ffef76b9b..5a686ba950498e75fe89ea18f5ba3dd692f8f7d5 100644 (file)
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -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>

diff --git a/src/interface/interface.c b/src/interface/interface.c
index 235053843381d7c124eba03850ecb5a6ef2f4d2e..57c88f677cb3f714a3c6d007f99e8950ef78619c 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -38,9 +38,6 @@
 #endif
 
 #include <assert.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 
 #include <vlc_common.h>
 #include <vlc_modules.h>

diff --git a/src/misc/block.c b/src/misc/block.c
index a7dfed914e842ea9c894fe8abcee56c564076398..3e953f167ab8f5d78aed4996b7f4dbf932ad99dc 100644 (file)
--- a/src/misc/block.c
+++ b/src/misc/block.c
@@ -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>

diff --git a/src/misc/mtime.c b/src/misc/mtime.c
index 06fa3b931a7328b64e1f4f640c3d9e5b2e6f3922..4bc2db2c07f3807350d8168326849162348e18ea 100644 (file)
--- a/src/misc/mtime.c
+++ b/src/misc/mtime.c
@@ -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

diff --git a/src/modules/bank.c b/src/modules/bank.c
index ea3ee5d1e0107f288f5fe1b8a6f2c7f6a7ddf2d9..ba2593b79f0880d9f2db4e73a7000900b546cd38 100644 (file)
--- a/src/modules/bank.c
+++ b/src/modules/bank.c
@@ -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>

diff --git a/src/modules/cache.c b/src/modules/cache.c
index ddf3f98f5f8fd4992c8f15696a494d15a9a520e4..f94d091550fb5ba8b3a022034e80de73fbb866c4 100644 (file)
--- a/src/modules/cache.c
+++ b/src/modules/cache.c
@@ -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>

diff --git a/src/network/httpd.c b/src/network/httpd.c
index 53b7511a95690715ff87ba575bac15f0f92b9b5b..ca41d2739200e7b562fa58a42764f490f4d8c661 100644 (file)
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -44,10 +44,7 @@
 
 #include <string.h>
 #include <errno.h>
-
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+#include <unistd.h>
 
 #ifdef HAVE_POLL
 # include <poll.h>

diff --git a/src/network/io.c b/src/network/io.c
index abf07a4b0e528455493fd4e662ff34c1b4be5891..d8832e21f0b503a7bada50e75978c0a6d04899ef 100644 (file)
--- a/src/network/io.c
+++ b/src/network/io.c
@@ -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

diff --git a/src/network/tcp.c b/src/network/tcp.c
index d968ae86d3ab6ad93a0f61c6bcffdb40decaeb53..083861d8ede48166ea62a6da138d2f78cd1ad34f 100644 (file)
--- a/src/network/tcp.c
+++ b/src/network/tcp.c
@@ -34,10 +34,7 @@
 
 #include <errno.h>
 #include <assert.h>
-
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+#include <unistd.h>
 #ifdef HAVE_POLL
 # include <poll.h>
 #endif

diff --git a/src/text/filesystem.c b/src/text/filesystem.c
index f3eb1d7f4c05c68bdaa4f0af08090db5dd22c6eb..981a053a22915a269f7934237da52d241faff822 100644 (file)
--- a/src/text/filesystem.c
+++ b/src/text/filesystem.c
@@ -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.