[Glibc-bsd-commits] r4643 - trunk/glibc-ports/fbtl/sysdeps/pthread

[Petr Salinger]

Author: ps-guest
Date: 2013-06-28 15:13:46 +0000 (Fri, 28 Jun 2013)
New Revision: 4643

Modified:
   trunk/glibc-ports/fbtl/sysdeps/pthread/aio_misc.h
   trunk/glibc-ports/fbtl/sysdeps/pthread/gai_misc.h
Log:
our lll_futex_timed_wait returns errors as positive numbers (2nd part)


Modified: trunk/glibc-ports/fbtl/sysdeps/pthread/aio_misc.h
===================================================================
--- trunk/glibc-ports/fbtl/sysdeps/pthread/aio_misc.h	2013-06-28 15:12:52 UTC (rev 4642)
+++ trunk/glibc-ports/fbtl/sysdeps/pthread/aio_misc.h	2013-06-28 15:13:46 UTC (rev 4643)
@@ -50,7 +50,7 @@
 	  {								      \
 	    status = lll_futex_timed_wait (futexaddr, oldval, timeout,	      \
 					   LLL_PRIVATE);		      \
-	    if (status != -EWOULDBLOCK)					      \
+	    if (status != EWOULDBLOCK)					      \
 	      break;							      \
 									      \
 	    oldval = *futexaddr;					      \
@@ -60,12 +60,12 @@
 	if (cancel)							      \
 	  LIBC_CANCEL_RESET (oldtype);					      \
 									      \
-	if (status == -EINTR)						      \
+	if (status == EINTR)						      \
 	  result = EINTR;						      \
-	else if (status == -ETIMEDOUT)					      \
+	else if (status == ETIMEDOUT)					      \
 	  result = EAGAIN;						      \
 	else								      \
-	  assert (status == 0 || status == -EWOULDBLOCK);		      \
+	  assert (status == 0 || status == EWOULDBLOCK);		      \
 									      \
 	pthread_mutex_lock (&__aio_requests_mutex);			      \
       }									      \

Modified: trunk/glibc-ports/fbtl/sysdeps/pthread/gai_misc.h
===================================================================
--- trunk/glibc-ports/fbtl/sysdeps/pthread/gai_misc.h	2013-06-28 15:12:52 UTC (rev 4642)
+++ trunk/glibc-ports/fbtl/sysdeps/pthread/gai_misc.h	2013-06-28 15:13:46 UTC (rev 4643)
@@ -51,7 +51,7 @@
 	  {								      \
 	    status = lll_futex_timed_wait (futexaddr, oldval, timeout,	      \
 					   LLL_PRIVATE);		      \
-	    if (status != -EWOULDBLOCK)					      \
+	    if (status != EWOULDBLOCK)					      \
 	      break;							      \
 									      \
 	    oldval = *futexaddr;					      \
@@ -61,12 +61,12 @@
 	if (cancel)							      \
 	  LIBC_CANCEL_RESET (oldtype);					      \
 									      \
-	if (status == -EINTR)						      \
+	if (status == EINTR)						      \
 	  result = EINTR;						      \
-	else if (status == -ETIMEDOUT)					      \
+	else if (status == ETIMEDOUT)					      \
 	  result = EAGAIN;						      \
 	else								      \
-	  assert (status == 0 || status == -EWOULDBLOCK);		      \
+	  assert (status == 0 || status == EWOULDBLOCK);		      \
 									      \
 	pthread_mutex_lock (&__gai_requests_mutex);			      \
       }									      \