@@ -350,11 +350,11 @@
 				  host: host];
 	}
 
 	memset(&addr, 0, sizeof(addr));
 	addr.sin_family = AF_INET;
-	addr.sin_port = of_bswap16_if_le(port);
+	addr.sin_port = OF_BSWAP16_IF_LE(port);
 
 	if (he->h_addrtype != AF_INET ||
 	    (sock = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) {
 # ifdef OF_THREADS
 		[addrlist release];
@@ -523,11 +523,11 @@
 				  host: host];
 	}
 
 	memset(&addr, 0, sizeof(addr));
 	addr.in.sin_family = AF_INET;
-	addr.in.sin_port = of_bswap16_if_le(port);
+	addr.in.sin_port = OF_BSWAP16_IF_LE(port);
 
 	if (he->h_addrtype != AF_INET || he->h_addr_list[0] == NULL) {
 # ifdef OF_THREADS
 		[mutex unlock];
 # endif
@@ -570,13 +570,13 @@
 							    host: host
 							    port: port];
 	}
 
 	if (addr.storage.ss_family == AF_INET)
-		return of_bswap16_if_le(addr.in.sin_port);
+		return OF_BSWAP16_IF_LE(addr.in.sin_port);
 	if (addr.storage.ss_family == AF_INET6)
-		return of_bswap16_if_le(addr.in6.sin6_port);
+		return OF_BSWAP16_IF_LE(addr.in6.sin6_port);
 
 	close(sock);
 	sock = INVALID_SOCKET;
 	@throw [OFBindFailedException exceptionWithClass: [self class]
 						  socket: self