about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-06-27 13:16:32 +0000
committerUlrich Drepper <drepper@redhat.com>1998-06-27 13:16:32 +0000
commit19c36e333722962398eb281fd7201ac45f5eb572 (patch)
tree8e7717ac6b0803fe302a3edd54b3e31e544444f5
parentbfc73ba2b6a817204d4e3f271607b015a7985d91 (diff)
downloadglibc-19c36e333722962398eb281fd7201ac45f5eb572.tar.gz
glibc-19c36e333722962398eb281fd7201ac45f5eb572.tar.xz
glibc-19c36e333722962398eb281fd7201ac45f5eb572.zip
Update.
	* sysdeps/unix/sysv/linux/poll.c: Likewise.
-rw-r--r--ChangeLog1
-rw-r--r--sysdeps/unix/sysv/linux/poll.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 7dce45aa52..de5184b588 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 1998-06-27 12:58  Ulrich Drepper  <drepper@cygnus.com>
 
 	* sysdeps/unix/bsd/poll.c: Define __poll, make poll weak alias.
+	* sysdeps/unix/sysv/linux/poll.c: Likewise.
 
 1998-06-27  7:07  Richard Henderson  <rth@cygnus.com>
 
diff --git a/sysdeps/unix/sysv/linux/poll.c b/sysdeps/unix/sysv/linux/poll.c
index e37df4cb9e..8119a974c1 100644
--- a/sysdeps/unix/sysv/linux/poll.c
+++ b/sysdeps/unix/sysv/linux/poll.c
@@ -32,7 +32,7 @@ static int __emulate_poll __P ((struct pollfd *fds, unsigned long int nfds,
 
 /* The real implementation.  */
 int
-poll (fds, nfds, timeout)
+__poll (fds, nfds, timeout)
      struct pollfd *fds;
      unsigned long int nfds;
      int timeout;
@@ -58,10 +58,10 @@ poll (fds, nfds, timeout)
 
   return __emulate_poll (fds, nfds, timeout);
 }
-
+weak_alias (__poll, poll)
 
 /* Get the emulation code.  */
-# define poll(fds, nfds, timeout) \
+# define __poll(fds, nfds, timeout) \
   static internal_function __emulate_poll (fds, nfds, timeout)
 #endif
 #include <sysdeps/unix/bsd/poll.c>