virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Make sure we don't try to emulate poll() when it's there if --disable-ffserver... 10l

Browse Source 
Originally committed as revision 7991 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
François Revol
2007-02-15 15:39:39 +00:00
parent 36c07acd59
commit 457b101e42
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/os_support.c
View File

@@ -103,6 +103,7 @@ done:
} }
#endif /* !defined(HAVE_INET_ATON) && defined(CONFIG_NETWORK) */ #endif /* !defined(HAVE_INET_ATON) && defined(CONFIG_NETWORK) */
#ifdef CONFIG_FFSERVER
#ifndef HAVE_SYS_POLL_H #ifndef HAVE_SYS_POLL_H
int poll(struct pollfd *fds, nfds_t numfds, int timeout) 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; return rc;
} }
#endif /* HAVE_SYS_POLL_H */ #endif /* HAVE_SYS_POLL_H */
#endif /* CONFIG_FFSERVER */

2
libavformat/os_support.h
View File

@@ -75,6 +75,7 @@ static inline int strcasecmp(const char* s1, const char* s2) { return stricmp(s1
#define closesocket close #define closesocket close
#endif #endif
#ifdef CONFIG_FFSERVER
#ifndef HAVE_SYS_POLL_H #ifndef HAVE_SYS_POLL_H
typedef unsigned long nfds_t; typedef unsigned long nfds_t;
@@ -101,5 +102,6 @@ struct pollfd {
extern int poll(struct pollfd *fds, nfds_t numfds, int timeout); extern int poll(struct pollfd *fds, nfds_t numfds, int timeout);
#endif /* HAVE_SYS_POLL_H */ #endif /* HAVE_SYS_POLL_H */
#endif /* CONFIG_FFSERVER */
#endif /* _OS_SUPPORT_H */ #endif /* _OS_SUPPORT_H */