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

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2016-03-19 23:40:07 +0000 (Sat, 19 Mar 2016)
New Revision: 5948

Modified:
   trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/malloc-machine.h
Log:
Merge from upstream:

commit 02d55fe04e380c1856993f3d8036b9e23736722d
Author: Joseph Myers <joseph at codesourcery.com>
Date:   Thu Sep 3 20:33:46 2015 +0000

    Rename bits/libc-tsd.h to libc-tsd.h (bug 14912).
    
    It was noted in
    <https://sourceware.org/ml/libc-alpha/2012-09/msg00305.html> that the
    bits/*.h naming scheme should only be used for installed headers.
    This patch renames bits/libc-tsd.h to plain libc-tsd.h to follow that
    convention.
    
    Tested for x86_64 (testing, and that installed stripped shared
    libraries are unchanged by the patch).



Modified: trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/malloc-machine.h
===================================================================
--- trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/malloc-machine.h	2016-03-19 23:36:50 UTC (rev 5947)
+++ trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/malloc-machine.h	2016-03-19 23:40:07 UTC (rev 5948)
@@ -60,7 +60,7 @@
 
 /* thread specific data for glibc */
 
-#include <bits/libc-tsd.h>
+#include <libc-tsd.h>
 
 typedef int tsd_key_t[1];	/* no key data structure, libc magic does it */
 __libc_tsd_define (static, void *, MALLOC)	/* declaration/common definition */