summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-03-27 06:55:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-27 06:55:14 +0000
commitac197dd2af86d6c946c424c99ca74ab7fc603440 (patch)
tree527a65c016d7566ccb3085d4c1d3d8dd4d1f9867 /include
parentefc6379e293a314fade5d13dc5ae815a64474ad0 (diff)
parent1188a4d856f6c840a2d39c44e35ba3f3cd86b3a5 (diff)
downloadsystem_core-ac197dd2af86d6c946c424c99ca74ab7fc603440.zip
system_core-ac197dd2af86d6c946c424c99ca74ab7fc603440.tar.gz
system_core-ac197dd2af86d6c946c424c99ca74ab7fc603440.tar.bz2
am 1188a4d8: am a596623f: am 6ccfabcf: Merge "O_CLOEXEC is O_NOINHERIT on Windows."
* commit '1188a4d856f6c840a2d39c44e35ba3f3cd86b3a5': O_CLOEXEC is O_NOINHERIT on Windows.
Diffstat (limited to 'include')
-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 */