commit f73ac3cccab7f5ab43aed913e46e58e376b214c1
author Maciej Żenczykowski <maze@google.com> Tue Nov 12 04:32:01 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 12 04:32:01 2019 -0800
tree 1840510a3839790b633d4aec779280c9d6e9c8eb
parent 263407d0e8bda96ac81ee226bf577bbe5a8bb499
parent da73cbaa9672af6f4cebc5c8d9b689f075cc5475

Merge "fix 'adb shell'"
am: 1d284004af

Change-Id: Ibc4532047231bc93ff876f13c328957e3cc2cffa

adb/sysdeps.h

diff --git a/adb/sysdeps.h b/adb/sysdeps.h
index 979413a..0c5a6b4 100644
--- a/adb/sysdeps.h
+++ b/adb/sysdeps.h
@@ -355,8 +355,8 @@
 
 static __inline__ void close_on_exec(borrowed_fd fd) {
     int flags = get_fd_flags(fd);
-    if (flags >= 0 && (flags & O_CLOEXEC) == 0) {
-        fcntl(fd.get(), F_SETFD, flags | O_CLOEXEC);
+    if (flags >= 0 && (flags & FD_CLOEXEC) == 0) {
+        fcntl(fd.get(), F_SETFD, flags | FD_CLOEXEC);
     }
 }