[Glibc-bsd-commits] r5772 - trunk/glibc-ports/kfreebsd/netinet

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2015-09-06 19:29:10 +0000 (Sun, 06 Sep 2015)
New Revision: 5772

Modified:
   trunk/glibc-ports/kfreebsd/netinet/tcp.h
Log:
Merge from glibc 2.19:
* sysdeps/gnu/netinet/tcp.h (struct tcphdr): Use anonymous unions
instead of making contents conditional on [__FAVOR_BSD].


Modified: trunk/glibc-ports/kfreebsd/netinet/tcp.h
===================================================================
--- trunk/glibc-ports/kfreebsd/netinet/tcp.h	2015-09-05 00:27:19 UTC (rev 5771)
+++ trunk/glibc-ports/kfreebsd/netinet/tcp.h	2015-09-06 19:29:10 UTC (rev 5772)
@@ -75,13 +75,16 @@
 #define MAX_SACK_BLKS   6       /* Max # SACK blocks stored at receiver side */   
 #define TCP_MAX_SACK    4       /* MAX # SACKs sent in any segment */
 
-# ifdef __FAVOR_BSD
 /*
  * TCP header.
  * Per RFC 793, September, 1981.
  */
 struct tcphdr
   {
+    __extension__ union
+    {
+      struct
+      {
     u_int16_t th_sport;		/* source port */
     u_int16_t th_dport;		/* destination port */
     tcp_seq th_seq;		/* sequence number */
@@ -105,10 +108,8 @@
     u_int16_t th_sum;		/* checksum */
     u_int16_t th_urp;		/* urgent pointer */
 };
-
-# else /* !__FAVOR_BSD */
-struct tcphdr
-  {
+      struct
+      {
     u_int16_t source;
     u_int16_t dest;
     u_int32_t seq;
@@ -140,7 +141,8 @@
     u_int16_t check;
     u_int16_t urg_ptr;
 };
-# endif /* __FAVOR_BSD */
+    };
+};
 
 enum
 {