vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Nov 3 20:47:39 2011 +0200| [ff96809b407550ba64b949b24c7c143ab72961ca] | committer: Rémi Denis-Courmont
Make vlc_network.h installable > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ff96809b407550ba64b949b24c7c143ab72961ca --- configure.ac | 2 +- include/vlc_network.h | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 5a4b021..be981b1 100644 --- a/configure.ac +++ b/configure.ac @@ -759,7 +759,7 @@ dnl Check for headers AC_CHECK_HEADERS([search.h]) AC_CHECK_HEADERS(getopt.h strings.h locale.h xlocale.h) AC_CHECK_HEADERS(fcntl.h sys/time.h sys/ioctl.h sys/stat.h) -AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h sys/eventfd.h]) +AC_CHECK_HEADERS([arpa/inet.h netinet/udplite.h sys/eventfd.h]) AC_CHECK_HEADERS([net/if.h], [], [], [ #include <sys/types.h> diff --git a/include/vlc_network.h b/include/vlc_network.h index cd9ae90..64fbf89 100644 --- a/include/vlc_network.h +++ b/include/vlc_network.h @@ -65,12 +65,7 @@ struct msghdr # endif #else # include <sys/socket.h> -# ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -# endif -# ifdef HAVE_ARPA_INET_H -# include <arpa/inet.h> -# endif +# include <netinet/in.h> # include <netdb.h> # define net_errno errno #endif @@ -179,9 +174,6 @@ VLC_API int vlc_poll(struct pollfd *fds, unsigned nfds, int timeout); # define SHUT_WR 1 # define SHUT_RDWR 2 # endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif # define net_Close( fd ) (void)close (fd) #endif _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
