Merge patch from JeremyF:
23-intercept-select-poll
Do the intercept thing for select and poll.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1298 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/vg_libpthread.c b/coregrind/vg_libpthread.c
index 7d5a789..600d198 100644
--- a/coregrind/vg_libpthread.c
+++ b/coregrind/vg_libpthread.c
@@ -2394,12 +2394,11 @@
kernel's error numbers (VKI_EINTR etc).
*/
-/* __attribute__((weak)) */
-int select ( int n,
- fd_set *rfds,
- fd_set *wfds,
- fd_set *xfds,
- struct timeval *timeout )
+int VGL_(select) ( int n,
+ fd_set *rfds,
+ fd_set *wfds,
+ fd_set *xfds,
+ struct timeval *timeout )
{
unsigned int ms_now, ms_end;
int res;
@@ -2543,8 +2542,7 @@
#endif
-/* __attribute__((weak)) */
-int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout)
+int VGL_(poll) (struct pollfd *__fds, nfds_t __nfds, int __timeout)
{
unsigned int ms_now, ms_end;
int res, i;
@@ -3340,8 +3338,6 @@
strong_alias(write, __write)
strong_alias(connect, __connect)
strong_alias(send, __send)
-strong_alias(poll, __poll)
-strong_alias(select, __select)
weak_alias (__pread64, pread64)
weak_alias (__pwrite64, pwrite64)