[FFmpeg-cvslog] r11924 - in trunk: configure ffserver.c libavformat/os_support.c libavformat/os_support.h

[lucabe]

Author: lucabe
Date: Wed Feb 13 13:51:14 2008
New Revision: 11924

Log:
Include poll.h instead of sys/poll.h


Modified:
   trunk/configure
   trunk/ffserver.c
   trunk/libavformat/os_support.c
   trunk/libavformat/os_support.h

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Wed Feb 13 13:51:14 2008
@@ -745,7 +745,7 @@ HAVE_LIST="
     sdl_video_size
     socklen_t
     soundcard_h
-    sys_poll_h
+    poll_h
     sys_select_h
     sys_soundcard_h
     termios_h
@@ -1595,7 +1595,7 @@ enabled zlib && check_lib zlib.h zlibVer
 # ffserver uses poll(),
 # if it's not found we can emulate it using select().
 if enabled ffserver; then
-    check_header sys/poll.h
+    check_header poll.h
     check_header sys/select.h
 fi
 

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	(original)
+++ trunk/ffserver.c	Wed Feb 13 13:51:14 2008
@@ -34,8 +34,8 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
+#ifdef HAVE_POLL_H
+#include <poll.h>
 #endif
 #include <errno.h>
 #include <sys/time.h>

Modified: trunk/libavformat/os_support.c
==============================================================================
--- trunk/libavformat/os_support.c	(original)
+++ trunk/libavformat/os_support.c	Wed Feb 13 13:51:14 2008
@@ -26,7 +26,7 @@
 #include "os_support.h"
 
 #ifdef CONFIG_NETWORK
-#ifndef HAVE_SYS_POLL_H
+#ifndef HAVE_POLL_H
 #ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #elif defined (HAVE_SYS_SELECT_H)
@@ -83,7 +83,7 @@ int ff_socket_nonblock(int socket, int e
 #endif /* CONFIG_NETWORK */
 
 #ifdef CONFIG_FFSERVER
-#ifndef HAVE_SYS_POLL_H
+#ifndef HAVE_POLL_H
 int poll(struct pollfd *fds, nfds_t numfds, int timeout)
 {
     fd_set read_set;
@@ -150,6 +150,6 @@ int poll(struct pollfd *fds, nfds_t numf
 
     return rc;
 }
-#endif /* HAVE_SYS_POLL_H */
+#endif /* HAVE_POLL_H */
 #endif /* CONFIG_FFSERVER */
 

Modified: trunk/libavformat/os_support.h
==============================================================================
--- trunk/libavformat/os_support.h	(original)
+++ trunk/libavformat/os_support.h	Wed Feb 13 13:51:14 2008
@@ -62,7 +62,7 @@ __declspec(dllimport) void __stdcall Sle
 #endif
 
 #ifdef CONFIG_FFSERVER
-#ifndef HAVE_SYS_POLL_H
+#ifndef HAVE_POLL_H
 typedef unsigned long nfds_t;
 
 struct pollfd {
@@ -87,7 +87,7 @@ struct pollfd {
 
 
 extern int poll(struct pollfd *fds, nfds_t numfds, int timeout);
-#endif /* HAVE_SYS_POLL_H */
+#endif /* HAVE_POLL_H */
 #endif /* CONFIG_FFSERVER */
 
 #endif /* FFMPEG_OS_SUPPORT_H */