| commit | d79326ceb34f15c5059edb86ce0b42c9f2cbd463 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Nov 04 19:08:55 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 04 19:08:55 2015 +0000 |
| tree | 60c3a945ed6e340d65ea8aaf9cd8e90e53c382eb | |
| parent | 2a9af99b711f3d2612ff0ab6ea3067d4e7fa2bc0 [diff] | |
| parent | 78058d7e8780e778c2e9a0ebd52d0f88795dc150 [diff] |
Merge "Fix adb GCC build (for google3)." am: 834799f01d am: 86088564de am: 18befbf016 * commit '18befbf0162d23140962497fece15c2de4009144': 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));