merge revs
vg_libpthread.c 1.90.2.9
vg_libpthread_unimp.c 1.30.2.4
Add sem_timedwait(). From Scott Smith <sls@cs.unt.edu>.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1238 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/vg_libpthread_unimp.c b/coregrind/vg_libpthread_unimp.c
index f6f7833..2184c77 100644
--- a/coregrind/vg_libpthread_unimp.c
+++ b/coregrind/vg_libpthread_unimp.c
@@ -157,7 +157,7 @@
//void raise ( void ) { unimp("raise"); }
void sem_close ( void ) { unimp("sem_close"); }
void sem_open ( void ) { unimp("sem_open"); }
-void sem_timedwait ( void ) { unimp("sem_timedwait"); }
+//void sem_timedwait ( void ) { unimp("sem_timedwait"); }
void sem_unlink ( void ) { unimp("sem_unlink"); }
//void sigaction ( void ) { unimp("sigaction"); }
//void siglongjmp ( void ) { unimp("siglongjmp"); }