From 457b101e42ed805ce1bd45f971ca333e96bea4ea Mon Sep 17 00:00:00 2001 From: François Revol Date: Thu, 15 Feb 2007 15:39:39 +0000 Subject: Make sure we don't try to emulate poll() when it's there if --disable-ffserver... 10l Originally committed as revision 7991 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/os_support.c | 4 ++-- libavformat/os_support.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'libavformat') diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 5427c567e6..795fab884b 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -103,6 +103,7 @@ done: } #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 @@ int poll(struct pollfd *fds, nfds_t numfds, int timeout) return rc; } - - #endif /* HAVE_SYS_POLL_H */ +#endif /* CONFIG_FFSERVER */ diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 34c2fabcd3..9d7ab4c7bb 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -75,6 +75,7 @@ static inline int strcasecmp(const char* s1, const char* s2) { return stricmp(s1 #define closesocket close #endif +#ifdef CONFIG_FFSERVER #ifndef HAVE_SYS_POLL_H typedef unsigned long nfds_t; @@ -101,5 +102,6 @@ struct pollfd { extern int poll(struct pollfd *fds, nfds_t numfds, int timeout); #endif /* HAVE_SYS_POLL_H */ +#endif /* CONFIG_FFSERVER */ #endif /* _OS_SUPPORT_H */ -- cgit v1.2.3