@@ -64,11 +64,11 @@
 	if (_atEndOfStream)
 		@throw [OFReadFailedException exceptionWithObject: self
 						  requestedLength: length
 							    errNo: ENOTCONN];
 
-#ifndef _WIN32
+#ifndef OF_WINDOWS
 	if ((ret = recv(_socket, buffer, length, 0)) < 0)
 		@throw [OFReadFailedException
 		    exceptionWithObject: self
 			requestedLength: length
 				  errNo: of_socket_errno()];
@@ -98,11 +98,11 @@
 	if (_atEndOfStream)
 		@throw [OFWriteFailedException exceptionWithObject: self
 						   requestedLength: length
 							     errNo: ENOTCONN];
 
-#ifndef _WIN32
+#ifndef OF_WINDOWS
 	if (length > SSIZE_MAX)
 		@throw [OFOutOfRangeException exception];
 
 	if (send(_socket, buffer, length, 0) != (ssize_t)length)
 		@throw [OFWriteFailedException
@@ -119,11 +119,11 @@
 			requestedLength: length
 				  errNo: of_socket_errno()];
 #endif
 }
 
-#ifdef _WIN32
+#ifdef OF_WINDOWS
 - (void)setBlocking: (bool)enable
 {
 	u_long v = enable;
 	_blocking = enable;
 
@@ -134,11 +134,11 @@
 }
 #endif
 
 - (int)fileDescriptorForReading
 {
-#ifndef _WIN32
+#ifndef OF_WINDOWS
 	return _socket;
 #else
 	if (_socket == INVALID_SOCKET)
 		return -1;
 
@@ -149,11 +149,11 @@
 #endif
 }
 
 - (int)fileDescriptorForWriting
 {
-#ifndef _WIN32
+#ifndef OF_WINDOWS
 	return _socket;
 #else
 	if (_socket == INVALID_SOCKET)
 		return -1;