commit 6867bb686e741c1719186379c1fa8caf8786dfa7
author Treehugger Robot <treehugger-gerrit@google.com> Mon May 02 14:30:53 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 02 14:30:53 2022 +0000
tree af13fbefd1a9dc7fab231309d2e754d553aa9294
parent 07a20408db2bf2749785e0d6a44d3fddea8e962d
parent 3c75dff2ebc4f0aa2abe66cd4b13baf3224475b8

Merge "remove spurious ifdef POSIX_SPAWN_CLOEXEC_DEFAULT"

service/jni/com_android_server_connectivity_ClatCoordinator.cpp

diff --git a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
index ba836b2..e2c5a63 100644
--- a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
+++ b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
@@ -315,10 +315,7 @@
 
     // TODO: use android::base::ScopeGuard.
     if (int ret = posix_spawnattr_setflags(&attr, POSIX_SPAWN_USEVFORK
-#ifdef POSIX_SPAWN_CLOEXEC_DEFAULT
-                                           | POSIX_SPAWN_CLOEXEC_DEFAULT
-#endif
-                                           )) {
+                                           | POSIX_SPAWN_CLOEXEC_DEFAULT)) {
         posix_spawnattr_destroy(&attr);
         throwIOException(env, "posix_spawnattr_setflags failed", ret);
         return -1;