diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-09-26 06:59:16 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-09-26 06:59:16 +0000 |
| commit | 23ac6e3a2eabed7eefb5af4a231a771572baa531 (patch) | |
| tree | 9a1aaa25b7403293c6444d16b9acdeb3f377556d /sysdeps/unix/bsd/bsd4.4/bits | |
| parent | 799ea679d3b989ada1a60ca1fc98a0117d0ff5b2 (diff) | |
| download | glibc-23ac6e3a2eabed7eefb5af4a231a771572baa531.tar.gz glibc-23ac6e3a2eabed7eefb5af4a231a771572baa531.tar.xz glibc-23ac6e3a2eabed7eefb5af4a231a771572baa531.zip | |
Update.
2001-09-25 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/bsd/bsd4.4/bits/socket.h (struct cmsghdr): Don't declare __cmsg_data field if its size would be bigger than 0. (CMSG_DATA): Adjust accordingly. * sysdeps/unix/sysv/aix/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/ia64/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/socket.h: Likewise. * elf/dl-lookup.c (_dl_lookup_symbol): Take type_class parameter now.
Diffstat (limited to 'sysdeps/unix/bsd/bsd4.4/bits')
| -rw-r--r-- | sysdeps/unix/bsd/bsd4.4/bits/socket.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sysdeps/unix/bsd/bsd4.4/bits/socket.h b/sysdeps/unix/bsd/bsd4.4/bits/socket.h index ef2a5bf86a..8d442aadd4 100644 --- a/sysdeps/unix/bsd/bsd4.4/bits/socket.h +++ b/sysdeps/unix/bsd/bsd4.4/bits/socket.h @@ -199,12 +199,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)) |