commit 04e9d07490fb84f72a309e47012b48735b90fc67
author Treehugger Robot <treehugger-gerrit@google.com> Fri Apr 17 23:28:40 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 17 23:28:40 2020 +0000
tree e9406dff57998bd7d7a643ab06c76095a0c49ae0
parent b416a925ab0535c41d2f8c69dcef7dc962dcbfcc
parent 4a1da79208ffff01e62aee6d1ffb13c3ef624792

Merge "adbconnection: delete unnecessary darwin workaround."

adb/libs/adbconnection/adbconnection_client.cpp

diff --git a/adb/libs/adbconnection/adbconnection_client.cpp b/adb/libs/adbconnection/adbconnection_client.cpp
index b569421..c132342 100644
--- a/adb/libs/adbconnection/adbconnection_client.cpp
+++ b/adb/libs/adbconnection/adbconnection_client.cpp
@@ -122,16 +122,7 @@
     return nullptr;
   }
 
-#if defined(__APPLE__)
-  ctx->control_socket_.reset(socket(AF_UNIX, SOCK_SEQPACKET, 0));
-  // TODO: find a better home for all these copies of the mac CLOEXEC workaround.
-  if (int fd = ctx->control_socket_.get(), flags = fcntl(fd, F_GETFD);
-      flags != -1 && (flags & FD_CLOEXEC) == 0) {
-    fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
-  }
-#else
   ctx->control_socket_.reset(socket(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0));
-#endif
   if (ctx->control_socket_ < 0) {
     PLOG(ERROR) << "failed to create Unix domain socket";
     return nullptr;