summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2013-02-01 16:32:18 +0000
committerAlexey Samsonov <samsonov@google.com>2013-02-01 16:32:18 +0000
commit4985b8766e62127c695f12554c6f28dd2b838c4f (patch)
treed0c6a3a2382603ac576ed64e2e17ab1512e2ff63
parent2e5080996196365b68a5e4c5603c444af4431e42 (diff)
downloadbcm5719-llvm-4985b8766e62127c695f12554c6f28dd2b838c4f.tar.gz
bcm5719-llvm-4985b8766e62127c695f12554c6f28dd2b838c4f.zip
[Sanitizer] use u32 instead of mode_t, which is defined in Darwin headers
llvm-svn: 174189
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h1
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_libc.h2
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_linux.cc2
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_mac.cc2
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_win.cc2
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 c84d54a153c..b0ce886e356 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 9b9c891efb1..911f5af3a4c 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 0fdc55b0015..f5edbf01a27 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 3bdc154eb86..a7bde030965 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 43c6fa9cf90..9c6b8ee5756 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();
}
OpenPOWER on IntegriCloud