From c288d485135b61653fda3b1aff3602affd6dd1d3 Mon Sep 17 00:00:00 2001
From: "Joon :ee" <joonlee@google.com>
Date: Wed, 4 Nov 2015 13:17:51 -0500
Subject: [PATCH] Fix adb GCC build (for google3).

Allow adb to build using gcc by explicitly using global scope for the
type for pollfd. An alternative would be to rename the pollfd field to
different, but I did not have a better name in mind.

Change-Id: I7925df1dca7e1acc5a289256f228e5fc3755e86e
---
 adb/fdevent.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adb/fdevent.cpp b/adb/fdevent.cpp
index 4458c85ec..06eb34dc2 100644
--- a/adb/fdevent.cpp
+++ b/adb/fdevent.cpp
@@ -54,7 +54,7 @@ int SHELL_EXIT_NOTIFY_FD = -1;
 
 struct PollNode {
   fdevent* fde;
-  pollfd pollfd;
+  ::pollfd pollfd;
 
   PollNode(fdevent* fde) : fde(fde) {
       memset(&pollfd, 0, sizeof(pollfd));