From 2895b8b5024af0b63eb4363ca3fb6e9a932994a1 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 3 Mar 2009 11:44:18 +0000 Subject: * net.cc: Include asm/byteorder.h. (htonl): Move to end of file. Add comment to explain why. Align definition to POSIX. Use related macro from asm/byteorder.h. (ntohl): Ditto. (htons): Ditto. (ntohs): Ditto. * include/asm/byteorder.h: Revert previous patch. --- winsup/cygwin/include/asm/byteorder.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'winsup/cygwin/include') diff --git a/winsup/cygwin/include/asm/byteorder.h b/winsup/cygwin/include/asm/byteorder.h index 3f59f7039..b656f814b 100644 --- a/winsup/cygwin/include/asm/byteorder.h +++ b/winsup/cygwin/include/asm/byteorder.h @@ -70,8 +70,7 @@ __ntohs(uint16_t x) #define __constant_htonl(x) __constant_ntohl(x) #define __constant_htons(x) __constant_ntohs(x) -#if defined (__OPTIMIZE__) && !defined (__NO_INLINE__) \ - && !defined (__INSIDE_CYGWIN_NET__) +#if defined (__OPTIMIZE__) && !defined (__NO_INLINE__) # define ntohl(x) \ (__builtin_constant_p((long)(x)) ? \ __constant_ntohl((x)) : \ -- cgit v1.2.3