[Glibc-bsd-commits] r6164 - trunk/glibc-ports-2.25/kfreebsd/bits

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2017-08-04 16:02:40 +0000 (Fri, 04 Aug 2017)
New Revision: 6164

Modified:
   trunk/glibc-ports-2.25/kfreebsd/bits/socket.h
Log:
Fixup bits/socket.h wrt __STDC_VERSION__

upstream commit cb765808fbffca30a1c67cf01ffdce30f8e6df3e


Modified: trunk/glibc-ports-2.25/kfreebsd/bits/socket.h
===================================================================
--- trunk/glibc-ports-2.25/kfreebsd/bits/socket.h	2017-08-04 15:51:15 UTC (rev 6163)
+++ trunk/glibc-ports-2.25/kfreebsd/bits/socket.h	2017-08-04 16:02:40 UTC (rev 6164)
@@ -242,7 +242,7 @@
 				   of cmsghdr structure.  */
     int cmsg_level;		/* Originating protocol.  */
     int cmsg_type;		/* Protocol specific type.  */
-#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L
+#if __glibc_c99_flexarr_available 
     __extension__ unsigned char __cmsg_data  __flexarr __attribute__ ((aligned (__alignof__(size_t)))); /* Ancillary data.  */
 #endif
   };
@@ -260,7 +260,7 @@
 #define CMSG_LEN(len)   (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
 
 /* Ancillary data object manipulation macros.  */
-#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L
+#if __glibc_c99_flexarr_available 
 # define CMSG_DATA(cmsg) ((cmsg)->__cmsg_data)
 #else
 # define CMSG_DATA(cmsg) ((unsigned char *) (cmsg) + CMSG_ALIGN(sizeof (struct cmsghdr)))