@@ -126,11 +126,11 @@
 			 service: service];
 	}
 
 	if ((se = getservbyname([service cString], "TCP")) != NULL)
 		port = se->s_port;
-	else if ((port = OF_BSWAP16_IF_LE(strtol([service cString], NULL,
+	else if ((port = of_bswap16_if_le(strtol([service cString], NULL,
 	    10))) == 0) {
 # ifdef OF_THREADS
 		[addrlist release];
 		[mutex unlock];
 # endif
@@ -253,11 +253,11 @@
 			 service: service];
 	}
 
 	if ((se = getservbyname([service cString], "TCP")) != NULL)
 		port = se->s_port;
-	else if ((port = OF_BSWAP16_IF_LE(strtol([service cString], NULL,
+	else if ((port = of_bswap16_if_le(strtol([service cString], NULL,
 	    10))) == 0) {
 # ifdef OF_THREADS
 		[mutex unlock];
 # endif
 		@throw [OFAddressTranslationFailedException