| commit | 86088564de6f688556e7f045e951dccd7b74f18c | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Nov 04 19:02:10 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 04 19:02:10 2015 +0000 |
| tree | e5049bf4b67cd38a92416e8411e7f283925a62f6 | |
| parent | 55316200b89e2a862969b0fac02c5b717ae3414b [diff] | |
| parent | 834799f01dbca29a6a0522a8d78c853ce18bf458 [diff] |
Merge "Fix adb GCC build (for google3)." am: 834799f01d * commit '834799f01dbca29a6a0522a8d78c853ce18bf458': 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));