[Glibc-bsd-commits] r5850 - trunk/glibc-ports-2.22/fbtl

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2015-12-02 21:22:20 +0000 (Wed, 02 Dec 2015)
New Revision: 5850

Modified:
   trunk/glibc-ports-2.22/fbtl/herrno.c
Log:
Merge from upstream:

commit 9acacaa02f3b75fddc07a56f3d848df45281a5de
Author: Joseph Myers <joseph at codesourcery.com>
Date:   Fri Jun 12 10:10:18 2015 +0000

    Fix h_errno namespace (bug 18520).



Modified: trunk/glibc-ports-2.22/fbtl/herrno.c
===================================================================
--- trunk/glibc-ports-2.22/fbtl/herrno.c	2015-12-02 20:56:12 UTC (rev 5849)
+++ trunk/glibc-ports-2.22/fbtl/herrno.c	2015-12-02 21:22:20 UTC (rev 5850)
@@ -23,12 +23,12 @@
 
 /* We need to have the error status variable of the resolver
    accessible in the libc.  */
-extern __thread int h_errno;
+extern __thread int __h_errno;
 
 
 /* When threaded, h_errno may be a per-thread variable.  */
 int *
 __h_errno_location (void)
 {
-  return &h_errno;
+  return &__h_errno;
 }