Changeset 2d652d01aaf909885fef474d2e3467dd6d56d083
- Timestamp:
- 06/08/08 18:09:50
(4 months ago)
- Author:
- Derk-Jan Hartman <hartman@videolan.org>
- git-committer:
- Derk-Jan Hartman <hartman@videolan.org> 1218038990 +0200
- git-parent:
[d934fc525f6be873a56c54dd97d0aa8f5fead910]
- git-author:
- Derk-Jan Hartman <hartman@videolan.org> 1218038990 +0200
- Message:
Revert "poll(): ifndef HAVE_POLL means we don't use poll(), not that it doesn't exist. In OSX poll() is broken for sockets, so we don't use it. Since poll is a kernel function in OSX however, the kernel implementation was used whenever we used poll(), instead of VLCs private poll() which was the intended behaviour. Renamed poll() to vlc_poll() to prevent this."
This reverts commit d934fc525f6be873a56c54dd97d0aa8f5fead910.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| rd934fc5 |
r2d652d0 |
|
| 236 | 236 | #define gettext_noop(str) (str) |
|---|
| 237 | 237 | |
|---|
| 238 | | #ifndef HAVE_POLL |
|---|
| 239 | | #define poll vlc_poll |
|---|
| 240 | | #endif |
|---|
| 241 | | |
|---|
| 242 | 238 | #endif /* !LIBVLC_FIXUPS_H */ |
|---|
| rd934fc5 |
r2d652d0 |
|
| 182 | 182 | }; |
|---|
| 183 | 183 | |
|---|
| 184 | | VLC_EXPORT (int, vlc_poll, (struct pollfd *fds, unsigned nfds, int timeout)); |
|---|
| | 184 | VLC_EXPORT (int, poll, (struct pollfd *fds, unsigned nfds, int timeout)); |
|---|
| 185 | 185 | #endif |
|---|
| 186 | 186 | |
|---|
| rd934fc5 |
r2d652d0 |
|
| 59 | 59 | # include <fcntl.h> |
|---|
| 60 | 60 | # include <sys/socket.h> |
|---|
| 61 | | #ifdef HAVE_POLL |
|---|
| 62 | | # include <poll.h> |
|---|
| 63 | | #else |
|---|
| 64 | | #undef _poll |
|---|
| 65 | | #include <vlc_network.h> |
|---|
| 66 | | #endif |
|---|
| | 61 | # include <sys/poll.h> |
|---|
| 67 | 62 | #endif |
|---|
| 68 | 63 | |
|---|
| rd934fc5 |
r2d652d0 |
|
| 323 | 323 | #endif |
|---|
| 324 | 324 | |
|---|
| 325 | | #ifndef HAVE_POLL |
|---|
| 326 | | # define _poll vlc_poll |
|---|
| 327 | | #endif |
|---|
| 328 | | |
|---|
| 329 | | #endif |
|---|
| | 325 | #endif |
|---|
| rd934fc5 |
r2d652d0 |
|
| 279 | 279 | __pl_Release |
|---|
| 280 | 280 | __pl_Yield |
|---|
| 281 | | vlc_poll |
|---|
| | 281 | poll |
|---|
| 282 | 282 | resolve_xml_special_chars |
|---|
| 283 | 283 | sdp_AddAttribute |
|---|
| rd934fc5 |
r2d652d0 |
|
| 33 | 33 | #include <vlc_network.h> |
|---|
| 34 | 34 | |
|---|
| 35 | | int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout) |
|---|
| | 35 | int poll (struct pollfd *fds, unsigned nfds, int timeout) |
|---|
| 36 | 36 | { |
|---|
| 37 | 37 | fd_set rdset, wrset, exset; |
|---|