commit df07f945b946fd1f7039d225ecd3de51a901ace7
author Tomasz Wasilczyk <twasilczyk@google.com> Thu Nov 02 15:07:45 2023 -0700
committer Tomasz Wasilczyk <twasilczyk@google.com> Fri Nov 03 09:40:33 2023 -0700
tree 1f37c190b6cd567549cfd14f3efca5eeb18c19a7
parent d429f318b42341f27d035072193c2d5da0826e93

Binder: migrate off libbase macros

Test: mma
Bug: 302723053
Change-Id: Ie7c13c324311f600d72bc8ecc4157ad6c46259a0

libs/binder/FdTrigger.cpp

diff --git a/libs/binder/FdTrigger.cpp b/libs/binder/FdTrigger.cpp
index 8ee6cb0..37c21bb 100644
--- a/libs/binder/FdTrigger.cpp
+++ b/libs/binder/FdTrigger.cpp
@@ -21,10 +21,11 @@
 
 #include <poll.h>
 
-#include <android-base/macros.h>
 #include <android-base/scopeguard.h>
 
 #include "RpcState.h"
+#include "Utils.h"
+
 namespace android {
 
 std::unique_ptr<FdTrigger> FdTrigger::make() {
@@ -77,7 +78,7 @@
     auto pollingStateGuard =
             android::base::make_scope_guard([&]() { transportFd.setPollingState(false); });
 
-    int ret = TEMP_FAILURE_RETRY(poll(pfd, arraysize(pfd), -1));
+    int ret = TEMP_FAILURE_RETRY(poll(pfd, countof(pfd), -1));
     if (ret < 0) {
         return -errno;
     }