From 7be671075d93f8ff08c59068a554db2c26f2bffd Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 11 Feb 2011 12:42:30 +0000 Subject: * include/endian.h: Move definitions of __BIG_ENDIAN, __LITTLE_ENDIAN, and __BYTE_ORDER into ... * include/bits/endian.h: New file. * include/arpa/nameser_compat.h: Include endian.h rather than defining BYTE_ORDER here. * include/asm/byteorder.h: Include bits/endian.h. Drop definition of __LITTLE_ENDIAN. * include/netinet/ip.h: Include bits/endian.h. Drop definitions of BIG_ENDIAN, LITTLE_ENDIAN, and BYTE_ORDER. Use underscored variants of aforementioned constants. * include/netinet/tcp.h: Ditto. * include/sys/param.h: Drop disabled definitions of BIG_ENDIAN, LITTLE_ENDIAN, and BYTE_ORDER. * include/netinet/ip.h: Reformat. Define setsockopt IP_TOS options matching recent RFCs. Tweak comments. --- winsup/cygwin/include/netinet/tcp.h | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'winsup/cygwin/include/netinet/tcp.h') diff --git a/winsup/cygwin/include/netinet/tcp.h b/winsup/cygwin/include/netinet/tcp.h index 305527d0e..8a6994326 100644 --- a/winsup/cygwin/include/netinet/tcp.h +++ b/winsup/cygwin/include/netinet/tcp.h @@ -37,14 +37,7 @@ #ifndef _NETINET_TCP_H #define _NETINET_TCP_H -/* Added by Wu Yongwei */ -#ifndef LITTLE_ENDIAN -#define LITTLE_ENDIAN 1234 -#define BIG_ENDIAN 4321 -#endif -#ifndef BYTE_ORDER -#define BYTE_ORDER LITTLE_ENDIAN -#endif +#include typedef u_int32_t tcp_seq; typedef u_int32_t tcp_cc; /* connection count per rfc1644 */ @@ -61,11 +54,11 @@ struct tcphdr { u_short th_dport; /* destination port */ tcp_seq th_seq; /* sequence number */ tcp_seq th_ack; /* acknowledgement number */ -#if BYTE_ORDER == LITTLE_ENDIAN +#if __BYTE_ORDER == __LITTLE_ENDIAN u_int th_x2:4, /* (unused) */ th_off:4; /* data offset */ #endif -#if BYTE_ORDER == BIG_ENDIAN +#if __BYTE_ORDER == __BIG_ENDIAN u_int th_off:4, /* data offset */ th_x2:4; /* (unused) */ #endif -- cgit v1.2.3