@@ -79,12 +79,12 @@
 #ifdef OF_HAVE_POLL
 		FDs = [[OFDataArray alloc] initWithItemSize:
 		    sizeof(struct pollfd)];
 		FDToStream = [[OFMutableDictionary alloc] init];
 #else
-		FD_ZERO(&readfds);
-		FD_ZERO(&writefds);
+		FD_ZERO(&readFDs);
+		FD_ZERO(&writeFDs);
 #endif
 
 #ifndef _WIN32
 		if (pipe(cancelFD))
 			@throw [OFInitializationFailedException
@@ -226,12 +226,12 @@
 	int fileDescriptor = [stream fileDescriptor];
 
 	FD_SET(fileDescriptor, FDSet);
 	FD_SET(fileDescriptor, &exceptFDs);
 
-	if (fd >= nfds)
-		nfds = fd + 1;
+	if (fileDescriptor >= nFDs)
+		nFDs = fileDescriptor + 1;
 
 	[pool release];
 }
 
 - (void)_removeStream: (OFStream*)stream
@@ -241,11 +241,11 @@
 	int fileDescriptor = [stream fileDescriptor];
 
 	FD_CLR(fileDescriptor, FDSet);
 
 	if (!FD_ISSET(fileDescriptor, otherFDSet))
-		FD_CLR(fileDescriptor, &exceptfds);
+		FD_CLR(fileDescriptor, &exceptFDs);
 }
 #endif
 
 - (void)addStreamToObserveForReading: (OFStream*)stream
 {