about summary refs log tree commit diff
path: root/io/poll.c
diff options
context:
space:
mode:
authorRyan S. Arnold <rsa@linux.vnet.ibm.com>2013-05-14 14:54:50 -0500
committerRyan S. Arnold <rsa@linux.vnet.ibm.com>2013-05-14 14:54:50 -0500
commit6d6691c0f4a53c0e1c1915e19e71544c6b55b491 (patch)
tree5c7728ea09523f99bfd9c542ad7ef962dd995c67 /io/poll.c
parent82fb7c849d61b544174de646181f5a159adb6ceb (diff)
parent0175558aa0a16a647ee368898a83a7d42e2011e8 (diff)
downloadglibc-6d6691c0f4a53c0e1c1915e19e71544c6b55b491.tar.gz
glibc-6d6691c0f4a53c0e1c1915e19e71544c6b55b491.tar.xz
glibc-6d6691c0f4a53c0e1c1915e19e71544c6b55b491.zip
Merge remote branch 'origin/master' into local_rsa_hwcap2_v3
Conflicts:
	ports/ChangeLog.arm
Diffstat (limited to 'io/poll.c')
-rw-r--r--io/poll.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/io/poll.c b/io/poll.c
index fadad38991..aa4c2d07e3 100644
--- a/io/poll.c
+++ b/io/poll.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1994-2013 Free Software Foundation, Inc.
+/* Poll (or wait) for file descriptor I/O availability.  Stub version.
+   Copyright (C) 1994-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -25,13 +26,12 @@
    or -1 for errors.  */
 
 int
-poll (fds, nfds, timeout)
-     struct pollfd *fds;
-     nfds_t nfds;
-     int timeout;
+__poll (struct pollfd *fds, nfds_t nfds, int timeout)
 {
   __set_errno (ENOSYS);
   return -1;
 }
+libc_hidden_def (__poll)
+weak_alias (__poll, poll)
 
 stub_warning (poll)