[Glibc-bsd-commits] r5832 - trunk/glibc-ports/fbtl

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2015-11-19 21:20:52 +0000 (Thu, 19 Nov 2015)
New Revision: 5832

Modified:
   trunk/glibc-ports/fbtl/nptl-init.c
   trunk/glibc-ports/fbtl/pthread_cond_timedwait.c
   trunk/glibc-ports/fbtl/pthread_rwlock_timedrdlock.c
   trunk/glibc-ports/fbtl/pthread_rwlock_timedwrlock.c
Log:
Merge from upstream:

commit c5c2b7c3fd823fc5c4a52506292a90eba60b0c62
Author: Joseph Myers <joseph at codesourcery.com>
Date:   Sat Dec 6 23:40:48 2014 +0000

    Fix pthreads getrlimit, gettimeofday namespace (bug 17682).



Modified: trunk/glibc-ports/fbtl/nptl-init.c
===================================================================
--- trunk/glibc-ports/fbtl/nptl-init.c	2015-11-19 13:59:57 UTC (rev 5831)
+++ trunk/glibc-ports/fbtl/nptl-init.c	2015-11-19 21:20:52 UTC (rev 5832)
@@ -420,7 +420,7 @@
   /* Determine the default allowed stack size.  This is the size used
      in case the user does not specify one.  */
   struct rlimit limit;
-  if (getrlimit (RLIMIT_STACK, &limit) != 0
+  if (__getrlimit (RLIMIT_STACK, &limit) != 0
       || limit.rlim_cur == RLIM_INFINITY)
     /* The system limit is not usable.  Use an architecture-specific
        default.  */

Modified: trunk/glibc-ports/fbtl/pthread_cond_timedwait.c
===================================================================
--- trunk/glibc-ports/fbtl/pthread_cond_timedwait.c	2015-11-19 13:59:57 UTC (rev 5831)
+++ trunk/glibc-ports/fbtl/pthread_cond_timedwait.c	2015-11-19 21:20:52 UTC (rev 5832)
@@ -130,7 +130,7 @@
 # else
 	/* Get the current time.  So far we support only one clock.  */
 	struct timeval tv;
-	(void) gettimeofday (&tv, NULL);
+	(void) __gettimeofday (&tv, NULL);
 
 	/* Convert the absolute timeout value to a relative timeout.  */
 	rt.tv_sec = abstime->tv_sec - tv.tv_sec;

Modified: trunk/glibc-ports/fbtl/pthread_rwlock_timedrdlock.c
===================================================================
--- trunk/glibc-ports/fbtl/pthread_rwlock_timedrdlock.c	2015-11-19 13:59:57 UTC (rev 5831)
+++ trunk/glibc-ports/fbtl/pthread_rwlock_timedrdlock.c	2015-11-19 21:20:52 UTC (rev 5832)
@@ -88,7 +88,7 @@
      || !defined lll_futex_timed_wait_bitset)
       /* Get the current time.  So far we support only one clock.  */
       struct timeval tv;
-      (void) gettimeofday (&tv, NULL);
+      (void) __gettimeofday (&tv, NULL);
 
       /* Convert the absolute timeout value to a relative timeout.  */
       struct timespec rt;

Modified: trunk/glibc-ports/fbtl/pthread_rwlock_timedwrlock.c
===================================================================
--- trunk/glibc-ports/fbtl/pthread_rwlock_timedwrlock.c	2015-11-19 13:59:57 UTC (rev 5831)
+++ trunk/glibc-ports/fbtl/pthread_rwlock_timedwrlock.c	2015-11-19 21:20:52 UTC (rev 5832)
@@ -80,7 +80,7 @@
      || !defined lll_futex_timed_wait_bitset)
       /* Get the current time.  So far we support only one clock.  */
       struct timeval tv;
-      (void) gettimeofday (&tv, NULL);
+      (void) __gettimeofday (&tv, NULL);
 
       /* Convert the absolute timeout value to a relative timeout.  */
       struct timespec rt;