@@ -97,11 +97,11 @@
 #endif
 
 	if (fd > _maxFD)
 		_maxFD = fd;
 
-	FD_SET((of_socket_t)fd, &_readFDs);
+	FD_SET((OFSocketHandle)fd, &_readFDs);
 
 	[super addObjectForReading: object];
 }
 
 - (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
@@ -121,11 +121,11 @@
 #endif
 
 	if (fd > _maxFD)
 		_maxFD = fd;
 
-	FD_SET((of_socket_t)fd, &_writeFDs);
+	FD_SET((OFSocketHandle)fd, &_writeFDs);
 
 	[super addObjectForWriting: object];
 }
 
 - (void)removeObjectForReading: (id <OFReadyForReadingObserving>)object
@@ -141,11 +141,11 @@
 #ifndef OF_WINDOWS
 	if (fd >= (int)FD_SETSIZE)
 		@throw [OFOutOfRangeException exception];
 #endif
 
-	FD_CLR((of_socket_t)fd, &_readFDs);
+	FD_CLR((OFSocketHandle)fd, &_readFDs);
 
 	[super removeObjectForReading: object];
 }
 
 - (void)removeObjectForWriting: (id <OFReadyForWritingObserving>)object
@@ -162,11 +162,11 @@
 #ifndef OF_WINDOWS
 	if (fd >= (int)FD_SETSIZE)
 		@throw [OFOutOfRangeException exception];
 #endif
 
-	FD_CLR((of_socket_t)fd, &_writeFDs);
+	FD_CLR((OFSocketHandle)fd, &_writeFDs);
 
 	[super removeObjectForWriting: object];
 }
 
 - (void)observeForTimeInterval: (OFTimeInterval)timeInterval
@@ -258,11 +258,11 @@
 	for (id <OFReadyForReadingObserving> object in
 	    [[_readObjects copy] autorelease]) {
 		void *pool2 = objc_autoreleasePoolPush();
 		int fd = object.fileDescriptorForReading;
 
-		if (FD_ISSET((of_socket_t)fd, &readFDs) &&
+		if (FD_ISSET((OFSocketHandle)fd, &readFDs) &&
 		    [_delegate respondsToSelector:
 		    @selector(objectIsReadyForReading:)])
 			[_delegate objectIsReadyForReading: object];
 
 		objc_autoreleasePoolPop(pool2);
@@ -271,11 +271,11 @@
 	for (id <OFReadyForWritingObserving> object in
 	    [[_writeObjects copy] autorelease]) {
 		void *pool2 = objc_autoreleasePoolPush();
 		int fd = object.fileDescriptorForWriting;
 
-		if (FD_ISSET((of_socket_t)fd, &writeFDs) &&
+		if (FD_ISSET((OFSocketHandle)fd, &writeFDs) &&
 		    [_delegate respondsToSelector:
 		    @selector(objectIsReadyForWriting:)])
 			[_delegate objectIsReadyForWriting: object];
 
 		objc_autoreleasePoolPop(pool2);