summaryrefslogtreecommitdiff
path: root/libc/sysdeps/linux/arm/bits/socket.h
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-10-17 06:01:24 +0000
committerEric Andersen <andersen@codepoet.org>2001-10-17 06:01:24 +0000
commitb1c97c3b65453ab7c5c736550e88ff3d4b51a57d (patch)
treef200bb1a627ca733634c83e092c350bb1f9464c7 /libc/sysdeps/linux/arm/bits/socket.h
parentfe1d95673ca906b6337daf62379f9de54aeb83bc (diff)
Bring these into line with glibc 2.2.4
Diffstat (limited to 'libc/sysdeps/linux/arm/bits/socket.h')
-rw-r--r--libc/sysdeps/linux/arm/bits/socket.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/libc/sysdeps/linux/arm/bits/socket.h b/libc/sysdeps/linux/arm/bits/socket.h
index 6ad4a5ed9..61644073b 100644
--- a/libc/sysdeps/linux/arm/bits/socket.h
+++ b/libc/sysdeps/linux/arm/bits/socket.h
@@ -233,12 +233,13 @@ struct cmsghdr
of cmsghdr structure. */
int cmsg_level; /* Originating protocol. */
int cmsg_type; /* Protocol specific type. */
+#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L
__extension__ unsigned char __cmsg_data __flexarr; /* Ancillary data. */
- /* XXX Perhaps this should be removed. */
+#endif
};
/* Ancillary data object manipulation macros. */
-#if !defined __STRICT_ANSI__ && defined __GNUC__ && __GNUC__ >= 2
+#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L
# define CMSG_DATA(cmsg) ((cmsg)->__cmsg_data)
#else
# define CMSG_DATA(cmsg) ((unsigned char *) ((struct cmsghdr *) (cmsg) + 1))