[Commits] r17052 - in /trunk/libc: ChangeLog.eglibc locale/localeinfo.h

[joseph@xxxxxxxxxx]

Author: joseph
Date: Wed Feb  8 21:00:15 2012
New Revision: 17052

Log:
	* locale/localeinfo.h: Condition <tls.h> include and
	NL_CURRENT_INDIRECT define on !defined IN_GLIBC_LOCALEDEF.

Modified:
    trunk/libc/ChangeLog.eglibc
    trunk/libc/locale/localeinfo.h

Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Wed Feb  8 21:00:15 2012
@@ -1,3 +1,8 @@
+2012-02-08  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* locale/localeinfo.h: Condition <tls.h> include and
+	NL_CURRENT_INDIRECT define on !defined IN_GLIBC_LOCALEDEF.
+
 2012-01-03  Tom de Vries  <tom@xxxxxxxxxxxxxxxx>
 
 	* elf/Makefile ($(objpfx)tst-initorder2.out): Add

Modified: trunk/libc/locale/localeinfo.h
==============================================================================
--- trunk/libc/locale/localeinfo.h (original)
+++ trunk/libc/locale/localeinfo.h Wed Feb  8 21:00:15 2012
@@ -216,7 +216,7 @@
    unused.  We can manage this playing some tricks with weak references.
    But with thread-local locale settings, it becomes quite ungainly unless
    we can use __thread variables.  So only in that case do we attempt this.  */
-#ifndef SHARED
+#if !defined SHARED && !defined IN_GLIBC_LOCALEDEF
 # include <tls.h>
 # define NL_CURRENT_INDIRECT	1
 #endif

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits