svn commit: trunk/uClibc/libc/unistd

[vapier at uclibc.org]

Author: vapier
Date: 2007-05-02 01:03:22 -0700 (Wed, 02 May 2007)
New Revision: 18535

Log:
Daniel Jacobowitz: sleep()/usleep() relies on nanosleep() being a cancellation
point but the files have "libc_hidden_proto(nanosleep)" which means it always
calls the libc.so version, never the wrapped version in libpthread.so that's a
cancellation point.


Modified:
   trunk/uClibc/libc/unistd/sleep.c
   trunk/uClibc/libc/unistd/usleep.c


Changeset:
Modified: trunk/uClibc/libc/unistd/sleep.c
===================================================================
--- trunk/uClibc/libc/unistd/sleep.c	2007-05-01 20:07:29 UTC (rev 18534)
+++ trunk/uClibc/libc/unistd/sleep.c	2007-05-02 08:03:22 UTC (rev 18535)
@@ -30,7 +30,7 @@
 //libc_hidden_proto(__sigaddset)
 //libc_hidden_proto(__sigemptyset)
 //libc_hidden_proto(__sigismember)
-libc_hidden_proto(nanosleep)
+/*libc_hidden_proto(nanosleep) need the reloc for cancellation*/
 
 #if 0
 /* This is a quick and dirty, but not 100% compliant with

Modified: trunk/uClibc/libc/unistd/usleep.c
===================================================================
--- trunk/uClibc/libc/unistd/usleep.c	2007-05-01 20:07:29 UTC (rev 18534)
+++ trunk/uClibc/libc/unistd/usleep.c	2007-05-02 08:03:22 UTC (rev 18535)
@@ -9,7 +9,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-libc_hidden_proto(nanosleep)
+/*libc_hidden_proto(nanosleep) need the reloc for cancellation*/
 
 int usleep (__useconds_t usec)
 {