[Ffmpeg-cvslog] r7991 - in trunk/libavformat: os_support.c os_support.h
mmu_man
subversion
Thu Feb 15 16:39:39 CET 2007
Author: mmu_man
Date: Thu Feb 15 16:39:39 2007
New Revision: 7991
Modified:
trunk/libavformat/os_support.c
trunk/libavformat/os_support.h
Log:
Make sure we don't try to emulate poll() when it's there if --disable-ffserver... 10l
Modified: trunk/libavformat/os_support.c
==============================================================================
--- trunk/libavformat/os_support.c (original)
+++ trunk/libavformat/os_support.c Thu Feb 15 16:39:39 2007
@@ -103,6 +103,7 @@
}
#endif /* !defined(HAVE_INET_ATON) && defined(CONFIG_NETWORK) */
+#ifdef CONFIG_FFSERVER
#ifndef HAVE_SYS_POLL_H
int poll(struct pollfd *fds, nfds_t numfds, int timeout)
{
@@ -161,7 +162,6 @@
return rc;
}
-
-
#endif /* HAVE_SYS_POLL_H */
+#endif /* CONFIG_FFSERVER */
Modified: trunk/libavformat/os_support.h
==============================================================================
--- trunk/libavformat/os_support.h (original)
+++ trunk/libavformat/os_support.h Thu Feb 15 16:39:39 2007
@@ -75,6 +75,7 @@
#define closesocket close
#endif
+#ifdef CONFIG_FFSERVER
#ifndef HAVE_SYS_POLL_H
typedef unsigned long nfds_t;
@@ -101,5 +102,6 @@
extern int poll(struct pollfd *fds, nfds_t numfds, int timeout);
#endif /* HAVE_SYS_POLL_H */
+#endif /* CONFIG_FFSERVER */
#endif /* _OS_SUPPORT_H */
More information about the ffmpeg-cvslog
mailing list