commit 457d8d9ae7bb43375d60a942b411e2262c0c84a3
author Raman Tenneti <rtenneti@google.com> Tue Nov 12 11:05:37 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 12 11:05:37 2019 -0800
tree c4c6d7bbaab5425d66f38c65d6d5ea65794a8cca
parent f73ac3cccab7f5ab43aed913e46e58e376b214c1
parent ad9aaae046f4093f55c45e62cdc465857c2f2a58

Merge "Revert "fix 'adb shell'""
am: 0117aabea0

Change-Id: Ifeaae5bfd99609bf2f8f51b40874638f4a45762d

adb/sysdeps.h

diff --git a/adb/sysdeps.h b/adb/sysdeps.h
index 0c5a6b4..979413a 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 & FD_CLOEXEC) == 0) {
-        fcntl(fd.get(), F_SETFD, flags | FD_CLOEXEC);
+    if (flags >= 0 && (flags & O_CLOEXEC) == 0) {
+        fcntl(fd.get(), F_SETFD, flags | O_CLOEXEC);
     }
 }