Differences From Artifact [7b1f8623a5]:
- File
src/OFStreamObserver.h
— part of check-in
[a61ab37726]
at
2011-04-01 22:14:32
on branch trunk
— Cancel the currently blocking -[observe] when the stream set is changed.
Not working on win32 yet, it will be ported to it later as it's not that
easy there, since select() can only observe sockets. (user: js, size: 4739) [annotate] [blame] [check-ins using]
To Artifact [ad26e6202d]:
- File src/OFStreamObserver.h — part of check-in [a10390bfd6] at 2011-04-06 20:07:16 on branch trunk — Port recent OFStreamObserver changes to Win32. (user: js, size: 4815) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
21 22 23 24 25 26 27 28 29 30 31 32 33 34 | #import "OFObject.h" #ifdef _WIN32 # ifndef _WIN32_WINNT # define _WIN32_WINNT 0x0501 # endif # include <windows.h> #endif @class OFStream; #ifdef OF_HAVE_POLL @class OFDataArray; #endif @class OFMutableArray; | > | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | #import "OFObject.h" #ifdef _WIN32 # ifndef _WIN32_WINNT # define _WIN32_WINNT 0x0501 # endif # include <windows.h> # include <ws2tcpip.h> #endif @class OFStream; #ifdef OF_HAVE_POLL @class OFDataArray; #endif @class OFMutableArray; |
| ︙ | ︙ | |||
85 86 87 88 89 90 91 92 93 94 95 96 97 98 | #else fd_set readfds; fd_set writefds; fd_set exceptfds; int nfds; #endif int cancelFd[2]; } #ifdef OF_HAVE_PROPERTIES @property (retain) id <OFStreamObserverDelegate> delegate; #endif /** | > > > | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | #else fd_set readfds; fd_set writefds; fd_set exceptfds; int nfds; #endif int cancelFd[2]; #ifdef _WIN32 struct sockaddr_in cancelAddr; #endif } #ifdef OF_HAVE_PROPERTIES @property (retain) id <OFStreamObserverDelegate> delegate; #endif /** |
| ︙ | ︙ |