Commit af1be3f5 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Check for struct pollfd separately from poll, needed for WinNT 6

parent 3a08aa70
...@@ -596,6 +596,17 @@ AC_SEARCH_LIBS(poll, [poll], [ ...@@ -596,6 +596,17 @@ AC_SEARCH_LIBS(poll, [poll], [
]) ])
]) ])
dnl Check for struct pollfd
AC_CHECK_TYPES([struct pollfd],,,
[#include <sys/types.h>
#if HAVE_POLL
# include <poll.h>
#elif defined (WIN32)
# include <winsock2.h>
#endif
])
dnl Check for connect
LIBS_save="$LIBS" LIBS_save="$LIBS"
SOCKET_LIBS="" SOCKET_LIBS=""
AC_SEARCH_LIBS(connect, [socket], [ AC_SEARCH_LIBS(connect, [socket], [
......
...@@ -252,7 +252,7 @@ void swab (const void *, void *, ssize_t); ...@@ -252,7 +252,7 @@ void swab (const void *, void *, ssize_t);
# define inet_ntop vlc_inet_ntop # define inet_ntop vlc_inet_ntop
#endif #endif
#ifndef HAVE_POLL #ifndef HAVE_STRUCT_POLLFD
enum enum
{ {
POLLIN=1, POLLIN=1,
...@@ -269,7 +269,8 @@ struct pollfd ...@@ -269,7 +269,8 @@ struct pollfd
unsigned events; unsigned events;
unsigned revents; unsigned revents;
}; };
#endif
#ifndef HAVE_POLL
# define poll(a, b, c) vlc_poll(a, b, c) # define poll(a, b, c) vlc_poll(a, b, c)
#elif defined (HAVE_MAEMO) #elif defined (HAVE_MAEMO)
# include <poll.h> # include <poll.h>
......
Supports Markdown
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