am e814b43c: Merge "Don\'t use TEMP_FAILURE_RETRY on close in frameworks/native."

* commit 'e814b43c581b16e144328c405a003ffece9ebf4d':
  Don't use TEMP_FAILURE_RETRY on close in frameworks/native.
This commit is contained in:
Elliott Hughes 2015-05-16 00:35:35 +00:00 committed by Android Git Automerger
commit b8e6cb08eb
2 changed files with 2 additions and 2 deletions

View File

@ -86,6 +86,6 @@ int main() {
} while (bytes_written != 0 && bytes_to_send > 0);
}
TEMP_FAILURE_RETRY(close(s));
close(s);
return 0;
}

View File

@ -306,7 +306,7 @@ static int _dump_file_from_fd(const char *title, const char *path, int fd) {
}
}
}
TEMP_FAILURE_RETRY(close(fd));
close(fd);
if (!newline) printf("\n");
if (title) printf("\n");