Mercurial > libavformat.hg

changeset 1799:0dc3a767943d libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make sure we don't try to emulate poll() when it's there if --disable-ffserver... 10l
author mmu_man
date Thu, 15 Feb 2007 15:39:39 +0000
parents d1e61f4d02cd
children 3edc6f0468be
files os_support.c os_support.h
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/os_support.c	Thu Feb 15 13:32:06 2007 +0000
+++ b/os_support.c	Thu Feb 15 15:39:39 2007 +0000
@@ -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 */
 
-#endif /* HAVE_SYS_POLL_H */
-
--- a/os_support.h	Thu Feb 15 13:32:06 2007 +0000
+++ b/os_support.h	Thu Feb 15 15:39:39 2007 +0000
@@ -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 */