summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Potapenko <glider@google.com>2014-02-27 16:46:06 +0000
committerAlexander Potapenko <glider@google.com>2014-02-27 16:46:06 +0000
commite8c311a40c7f2eb64d5c253b38010feec4698fd5 (patch)
treed1e872e2dafa4a87f3703271a4e8dabb31f8e6d5
parent21039aac60b9f40309874d4c85f3b3677c97866f (diff)
downloadbcm5719-llvm-e8c311a40c7f2eb64d5c253b38010feec4698fd5.tar.gz
bcm5719-llvm-e8c311a40c7f2eb64d5c253b38010feec4698fd5.zip
[ASan] Make sure IOC_DIRMASK is undefined before redefining it.
llvm-svn: 202410
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
index 78c01be4362..5827dda816b 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -631,6 +631,9 @@ namespace __sanitizer {
#define IOC_NRMASK ((1 << IOC_NRBITS) - 1)
#define IOC_TYPEMASK ((1 << IOC_TYPEBITS) - 1)
#define IOC_SIZEMASK ((1 << IOC_SIZEBITS) - 1)
+#if defined(IOC_DIRMASK)
+#undef IOC_DIRMASK
+#endif
#define IOC_DIRMASK ((1 << IOC_DIRBITS) - 1)
#define IOC_NRSHIFT 0
#define IOC_TYPESHIFT (IOC_NRSHIFT + IOC_NRBITS)
OpenPOWER on IntegriCloud