From 4985b8766e62127c695f12554c6f28dd2b838c4f Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Fri, 1 Feb 2013 16:32:18 +0000 Subject: [PATCH] [Sanitizer] use u32 instead of mode_t, which is defined in Darwin headers llvm-svn: 174189 --- compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h | 1 - compiler-rt/lib/sanitizer_common/sanitizer_libc.h | 2 +- compiler-rt/lib/sanitizer_common/sanitizer_linux.cc | 2 +- compiler-rt/lib/sanitizer_common/sanitizer_mac.cc | 2 +- compiler-rt/lib/sanitizer_common/sanitizer_win.cc | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h b/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h index c84d54a..b0ce886 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h @@ -65,7 +65,6 @@ typedef signed short s16; // NOLINT typedef signed int s32; typedef signed long long s64; // NOLINT typedef int fd_t; -typedef u32 mode_t; } // namespace __sanitizer diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_libc.h b/compiler-rt/lib/sanitizer_common/sanitizer_libc.h index 9b9c891e..911f5af 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_libc.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_libc.h @@ -66,7 +66,7 @@ int internal_isatty(fd_t fd); // Use __sanitizer::OpenFile() instead. fd_t internal_open(const char *filename, int flags); -fd_t internal_open(const char *filename, int flags, mode_t mode); +fd_t internal_open(const char *filename, int flags, u32 mode); uptr internal_read(fd_t fd, void *buf, uptr count); uptr internal_write(fd_t fd, const void *buf, uptr count); diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc index 0fdc55b..f5edbf0 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc @@ -72,7 +72,7 @@ fd_t internal_open(const char *filename, int flags) { return syscall(__NR_open, filename, flags); } -fd_t internal_open(const char *filename, int flags, mode_t mode) { +fd_t internal_open(const char *filename, int flags, u32 mode) { return syscall(__NR_open, filename, flags, mode); } diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc b/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc index 3bdc154..a7bde03 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc @@ -52,7 +52,7 @@ fd_t internal_open(const char *filename, int flags) { return open(filename, flags); } -fd_t internal_open(const char *filename, int flags, mode_t mode) { +fd_t internal_open(const char *filename, int flags, u32 mode) { return open(filename, flags, mode); } diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_win.cc b/compiler-rt/lib/sanitizer_common/sanitizer_win.cc index 43c6fa9..9c6b8ee 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_win.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_win.cc @@ -195,7 +195,7 @@ fd_t internal_open(const char *filename, int flags) { UNIMPLEMENTED(); } -fd_t internal_open(const char *filename, int flags, mode_t mode) { +fd_t internal_open(const char *filename, int flags, u32 mode) { UNIMPLEMENTED(); } -- 2.7.4