[compiler-rt] r202410 - [ASan] Make sure IOC_DIRMASK is undefined before redefining it.

Alexander Potapenko glider at google.com
Thu Feb 27 08:46:06 PST 2014


Author: glider
Date: Thu Feb 27 10:46:06 2014
New Revision: 202410

URL: http://llvm.org/viewvc/llvm-project?rev=202410&view=rev
Log:
[ASan] Make sure IOC_DIRMASK is undefined before redefining it.

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h?rev=202410&r1=202409&r2=202410&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h Thu Feb 27 10:46:06 2014
@@ -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)





More information about the llvm-commits mailing list