Merge "Fix adb GCC build (for google3)."

am: 834799f01d

* commit '834799f01dbca29a6a0522a8d78c853ce18bf458':
  Fix adb GCC build (for google3).
This commit is contained in:
Elliott Hughes 2015-11-04 19:02:10 +00:00 committed by android-build-merger
commit 86088564de

View file

@ -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));