commit c3d97280a1adf08a3f6d7c6fafdb5eb66f3f61db
author Raman Tenneti <rtenneti@google.com> Tue Nov 12 11:10:15 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 12 11:10:15 2019 -0800
tree 3907d02d29cbb73284b487ce43fbad3008b6f6b4
parent 5a91f65315130b90197af8d7490dda0ce37403d5
parent 457d8d9ae7bb43375d60a942b411e2262c0c84a3

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

Change-Id: I26aeb80cad7a20bf8c4ed09222bcd8b0a2799d88

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);
     }
 }