[compiler-rt] r191358 - [Sanitizer] Don't include wordexp.h on Android

Alexey Samsonov samsonov at google.com
Wed Sep 25 00:41:46 PDT 2013


Author: samsonov
Date: Wed Sep 25 02:41:46 2013
New Revision: 191358

URL: http://llvm.org/viewvc/llvm-project?rev=191358&view=rev
Log:
[Sanitizer] Don't include wordexp.h on Android

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

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc?rev=191358&r1=191357&r2=191358&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc Wed Sep 25 02:41:46 2013
@@ -42,7 +42,6 @@
 #include <termios.h>
 #include <time.h>
 #include <wchar.h>
-#include <wordexp.h>
 
 #if SANITIZER_LINUX
 #include <utime.h>
@@ -64,6 +63,7 @@
 
 #if !SANITIZER_ANDROID
 #include <sys/ucontext.h>
+#include <wordexp.h>
 #endif
 
 #if SANITIZER_LINUX && !SANITIZER_ANDROID
@@ -875,9 +875,11 @@ CHECK_TYPE_SIZE(__kernel_loff_t);
 CHECK_TYPE_SIZE(__kernel_fd_set);
 #endif
 
+#if !SANITIZER_ANDROID
 CHECK_TYPE_SIZE(wordexp_t);
 CHECK_SIZE_AND_OFFSET(wordexp_t, we_wordc);
 CHECK_SIZE_AND_OFFSET(wordexp_t, we_wordv);
 CHECK_SIZE_AND_OFFSET(wordexp_t, we_offs);
+#endif
 
 #endif  // SANITIZER_LINUX || SANITIZER_MAC





More information about the llvm-commits mailing list