From 13904b552b48e72bc472f98144ab54d0535ce99e Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 28 Jan 2011 17:16:15 +0000 Subject: 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 (cherry picked from commit 362d8f7d9e6a3bca2ce89f767d153d3ab8bf5773) --- libavformat/os_support.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'libavformat/os_support.h') 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 */ -- cgit v1.2.1