@@ -15,10 +15,11 @@ */ #include "config.h" #define OF_STREAM_OBSERVER_M +#define __NO_EXT_QNX #include #include @@ -39,10 +40,12 @@ #endif #import "OFAutoreleasePool.h" #import "OFInitializationFailedException.h" #import "OFOutOfRangeException.h" + +#import "macros.h" #ifdef _WIN32 # define close(sock) closesocket(sock) #endif @@ -153,18 +156,16 @@ [super dealloc]; } - (id )delegate { - return [[(id)delegate retain] autorelease]; + OF_GETTER(delegate, YES) } - (void)setDelegate: (id )delegate_ { - [(id)delegate_ retain]; - [(id)delegate release]; - delegate = delegate_; + OF_SETTER(delegate, delegate_, YES, NO) } #ifdef OF_HAVE_POLL - (void)_addStream: (OFStream*)stream withEvents: (short)events @@ -487,10 +488,13 @@ readfds_ = readfds; writefds_ = writefds; exceptfds_ = exceptfds; # endif + tv.tv_sec = timeout / 1000; + tv.tv_usec = (timeout % 1000) * 1000; + if (select(nfds, &readfds_, &writefds_, &exceptfds_, (timeout != -1 ? &tv : NULL)) < 1) return NO; if (FD_ISSET(cancelFd[0], &readfds_)) {