summaryrefslogtreecommitdiff
path: root/lib/sanitizer_common/sanitizer_platform_limits_posix.h
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2016-06-14 15:22:37 +0000
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2016-06-14 15:22:37 +0000
commiteef7355c1bfd9ca942cec616b76eb7da93f36172 (patch)
tree1eb79dab74712977adf2eee17a76ebcca3142728 /lib/sanitizer_common/sanitizer_platform_limits_posix.h
parentb90f32bd596ec6e4c29d1e22bf83da6b2539d132 (diff)
[sanitizer] Revert new GLIBC msghdr/cmsghdr definitions
GLIBC reverted the POSIX conformance changes for msghdr/cmsghdr [1], so there is no need to fix it on sanitizers. [1] https://sourceware.org/git/?p=glibc.git;a=commit;h=78880cc185dc521855a58001a28e3059722d8e85 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@272678 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/sanitizer_platform_limits_posix.h')
-rw-r--r--lib/sanitizer_common/sanitizer_platform_limits_posix.h44
1 files changed, 0 insertions, 44 deletions
diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/lib/sanitizer_common/sanitizer_platform_limits_posix.h
index ba49c5e21..14bc75046 100644
--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -415,49 +415,6 @@ namespace __sanitizer {
int cmsg_type;
};
#else
-# ifndef __GLIBC_PREREQ
-# define __GLIBC_PREREQ(x, y) 0
-# endif
-// GLIBC 2.24 follows msghdr and cmsghdr POSIX definition for internal
-// member size and adds padding where required.
-# if __GLIBC_PREREQ(2, 24) && defined(_LP64)
-# if __BYTE_ORDER == __BIG_ENDIAN
- struct __sanitizer_msghdr {
- void *msg_name;
- unsigned msg_namelen;
- struct __sanitizer_iovec *msg_iov;
- int __padding1;
- unsigned msg_iovlen;
- void *msg_control;
- int __padding2;
- unsigned msg_controllen;
- int msg_flags;
- };
- struct __sanitizer_cmsghdr {
- uptr cmsg_len;
- int cmsg_level;
- int cmsg_type;
- };
-# else
- struct __sanitizer_msghdr {
- void *msg_name;
- unsigned msg_namelen;
- struct __sanitizer_iovec *msg_iov;
- int msg_iovlen;
- int __padding1;
- void *msg_control;
- int msg_controllen;
- int __padding2;
- int msg_flags;
- };
- struct __sanitizer_cmsghdr {
- unsigned cmsg_len;
- int __padding1;
- int cmsg_level;
- int cmsg_type;
- };
-# endif // __BYTE_ORDER == __BIG_ENDIAN
-# else
struct __sanitizer_msghdr {
void *msg_name;
unsigned msg_namelen;
@@ -472,7 +429,6 @@ namespace __sanitizer {
int cmsg_level;
int cmsg_type;
};
-# endif // __GLIBC_PREREQ (2, 24) && __WORDSIZE == 64
#endif
#if SANITIZER_MAC