Browse Source
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/trunktags/v0.5
François Revol
18 years ago
2 changed files with 4 additions and 2 deletions
Unified View
Diff Options
-
+2 -2libavformat/os_support.c
-
+2 -0libavformat/os_support.h
+ 2
- 2
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
- 0
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 */ | ||||