| commit | 78058d7e8780e778c2e9a0ebd52d0f88795dc150 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Nov 04 19:06:02 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 04 19:06:02 2015 +0000 |
| tree | de1c91d8bd96aa1481eb5169ba47c777fa722e69 | |
| parent | 91bb8fc627238220d7e54b708bed4301b17fea38 [diff] | |
| parent | 1639b9dbed8db8c2cd23625795b626636b170a02 [diff] |
Merge "Fix adb GCC build (for google3)." am: 834799f01d am: 86088564de * commit '86088564de6f688556e7f045e951dccd7b74f18c': Fix adb GCC build (for google3).
diff --git a/adb/fdevent.cpp b/adb/fdevent.cpp index 4458c85..06eb34d 100644 --- a/adb/fdevent.cpp +++ b/adb/fdevent.cpp
@@ -54,7 +54,7 @@ struct PollNode { fdevent* fde; - pollfd pollfd; + ::pollfd pollfd; PollNode(fdevent* fde) : fde(fde) { memset(&pollfd, 0, sizeof(pollfd));