diff options
| author | François Revol <revol@free.fr> | 2007-02-15 15:39:39 +0000 |
|---|---|---|
| committer | François Revol <revol@free.fr> | 2007-02-15 15:39:39 +0000 |
| commit | 457b101e42ed805ce1bd45f971ca333e96bea4ea (patch) | |
| tree | b9fa0b635f19eabb91baccd69cdd8b531f133fa3 /libavformat/os_support.c | |
| parent | 36c07acd595288c2747d491993d044b81593b00c (diff) | |
| download | ffmpeg-457b101e42ed805ce1bd45f971ca333e96bea4ea.tar.gz | |
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
Diffstat (limited to 'libavformat/os_support.c')
| -rw-r--r-- | libavformat/os_support.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 */ |