| commit | 834799f01dbca29a6a0522a8d78c853ce18bf458 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Nov 04 18:51:54 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Nov 04 18:51:54 2015 +0000 |
| tree | 7b2b57f1f3d12c42c4ee4d7fc1555c37e1722701 | |
| parent | 8897a3fffd28c779dcfd8e5988ae90f5da7b5a88 [diff] | |
| parent | c288d485135b61653fda3b1aff3602affd6dd1d3 [diff] |
Merge "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));