[FFmpeg-devel] [PATCH] os_support: protect poll() related declarations only by HAVE_POLL_H (original) (raw)

Ronald S. Bultje rsbultje
Fri Jan 28 18:06:25 CET 2011

Hi,

2011/1/28 M?ns Rullg?rd :

"Ronald S. Bultje" writes:

On Fri, Jan 28, 2011 at 11:57 AM, Mans Rullgard wrote:

This should fix building on systems without poll(), broken by a8475bbdb64e638bd8161df9647876fd23f8a29a.

Signed-off-by: Mans Rullgard --- ?libavformat/ossupport.h | ? ?4 +--- ?1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/libavformat/ossupport.h b/libavformat/ossupport.h index 5c9e81b..404d982 100644 --- a/libavformat/ossupport.h +++ b/libavformat/ossupport.h @@ -54,8 +54,8 @@ typedef int socklent; ?#if !HAVECLOSESOCKET ?#define closesocket close ?#endif +#endif /* CONFIGNETWORK */ -#if CONFIGFFSERVER ?#if !HAVEPOLLH ?typedef unsigned long nfdst; @@ -82,7 +82,5 @@ struct pollfd { ?int poll(struct pollfd *fds, nfdst numfds, int timeout); ?#endif /* HAVEPOLLH */ -#endif /* CONFIGFFSERVER */ -#endif /* CONFIGNETWORK */ ?#endif /* AVFORMATOSSUPPORTH */ -- 1.7.3.5 That doesn't look right, poll should be under CONFIGNETWORK. Are the demuxers causing this problem not under CONFIGNETWORK themselves? The poll() emulation isn't under CONFIGNETWORK. ?I assumed that was for a reason.

It should be.

Ronald

More information about the ffmpeg-devel mailing list