commit ff26a16c1de7be696719e9001f0707b7c55b52cf
author Elliott Hughes <enh@google.com> Thu Aug 17 22:34:21 2017 +0000
committer Elliott Hughes <enh@google.com> Fri Aug 18 00:00:38 2017 +0000
tree 1f2667df4a1ed2dd79cb53a6231cb88d3d9ade13
parent 9af9120091ceb96641d7c6c645fabad96db4bc0d

Re-submit "Name function arguments in libc headers for Studio."

This reverts commit 9af9120091ceb96641d7c6c645fabad96db4bc0d (a revert
of 079bff4fa52b0c3c76057451cc9cdecf1827fce0), now the versioner bug is
fixed.

Bug: http://b/64613623 # header bug
Bug: http://b/64802958 # versioner bug
Change-Id: I1cb9d7832d4b3aecdc57a9285e2291443e59d02d

libc/include/poll.h

diff --git a/libc/include/poll.h b/libc/include/poll.h
index 0f5758d..8517dc6 100644
--- a/libc/include/poll.h
+++ b/libc/include/poll.h
@@ -38,9 +38,8 @@
 
 typedef unsigned int nfds_t;
 
-int poll(struct pollfd*, nfds_t, int) __overloadable __RENAME_CLANG(poll);
-int ppoll(struct pollfd*, nfds_t, const struct timespec*, const sigset_t*)
-        __overloadable __RENAME_CLANG(ppoll) __INTRODUCED_IN(21);
+int poll(struct pollfd* __fds, nfds_t __count, int __timeout_ms) __overloadable __RENAME_CLANG(poll);
+int ppoll(struct pollfd* __fds, nfds_t __count, const struct timespec* __timeout, const sigset_t* __mask) __overloadable __RENAME_CLANG(ppoll) __INTRODUCED_IN(21);
 
 #if defined(__BIONIC_INCLUDE_FORTIFY_HEADERS)
 #include <bits/fortify/poll.h>
@@ -48,4 +47,4 @@
 
 __END_DECLS
 
-#endif /* _POLL_H_ */
+#endif