diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-01-28 17:16:15 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-01-28 17:23:19 +0000 |
| commit | 362d8f7d9e6a3bca2ce89f767d153d3ab8bf5773 (patch) | |
| tree | e82bd8847ca1af3c244696dfe7ff321bb9dd9b0a /libavformat/os_support.h | |
| parent | 4fc9ff0ad6f0f6b2c7443c6b4a3a1c817e97fdfd (diff) | |
| download | ffmpeg-362d8f7d9e6a3bca2ce89f767d153d3ab8bf5773.tar.gz | |
os_support: make poll() fallbacks conditional on CONFIG_NETWORK
poll() is only used by networking code, so the fallback should
only be built if networking is enabled. Also remove CONFIG_FFSERVER
condition from the declarations.
This should fix building on systems without poll(), broken
by a8475bbdb64e638bd8161df9647876fd23f8a29a.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavformat/os_support.h')
| -rw-r--r-- | libavformat/os_support.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 5c9e81b340..df321511ed 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -55,7 +55,6 @@ typedef int socklen_t; #define closesocket close #endif -#if CONFIG_FFSERVER #if !HAVE_POLL_H typedef unsigned long nfds_t; @@ -82,7 +81,6 @@ struct pollfd { int poll(struct pollfd *fds, nfds_t numfds, int timeout); #endif /* HAVE_POLL_H */ -#endif /* CONFIG_FFSERVER */ #endif /* CONFIG_NETWORK */ #endif /* AVFORMAT_OS_SUPPORT_H */ |