Remove inconsistently used HAVE_UNISTD_H

13 years ago · c4199ab677
32 changed files with 33 additions and 118 deletions
--- 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)
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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
--- 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>
--- 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>
--- 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>

--- 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
--- 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
--- 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 );
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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>
--- 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>
--- 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>
--- 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
--- 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
--- 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.