summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-03-27 06:34:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-27 06:34:45 +0000
commita596623fbf3c38e08ee5b3d2663f96258492e452 (patch)
treea251515a40cd651eb1f2bdae27f2d87e4805748f
parentbe1eb6d4358dc3e66f2717d2d5da570b67a00415 (diff)
parent6ccfabcf5d547a04a1e6c5237f20670230a7f6a4 (diff)
downloadsystem_core-a596623fbf3c38e08ee5b3d2663f96258492e452.zip
system_core-a596623fbf3c38e08ee5b3d2663f96258492e452.tar.gz
system_core-a596623fbf3c38e08ee5b3d2663f96258492e452.tar.bz2
am 6ccfabcf: Merge "O_CLOEXEC is O_NOINHERIT on Windows."
* commit '6ccfabcf5d547a04a1e6c5237f20670230a7f6a4': O_CLOEXEC is O_NOINHERIT on Windows.
-rw-r--r--include/utils/Compat.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/utils/Compat.h b/include/utils/Compat.h
index a238afe..ca4a8e0 100644
--- a/include/utils/Compat.h
+++ b/include/utils/Compat.h
@@ -36,7 +36,7 @@ static inline ssize_t pread64(int fd, void* buf, size_t nbytes, off64_t offset)
#endif /* __APPLE__ */
#if defined(_WIN32)
-#define O_CLOEXEC 0
+#define O_CLOEXEC O_NOINHERIT
#define O_NOFOLLOW 0
#define DEFFILEMODE 0666
#endif /* _WIN32 */