aboutsummaryrefslogtreecommitdiffstats
path: root/include/runetype.h
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2012-02-14 21:48:46 +0000
committerDimitry Andric <dim@FreeBSD.org>2012-02-14 21:48:46 +0000
commitb74cf6dcf17dd06d3b530f7d4bec6191728f24b9 (patch)
tree00a985b9380f82c7f307d0bcf2af19ad578ceabb /include/runetype.h
parenta40c00a535e3b71a50072880ef05e22b0cf2732b (diff)
downloadsrc-b74cf6dcf17dd06d3b530f7d4bec6191728f24b9.tar.gz
src-b74cf6dcf17dd06d3b530f7d4bec6191728f24b9.zip
Revert r231673 and r231682 for now, until we can run a full make
universe with them. Sorry for the breakage. Pointy hat to: me and brooks
Notes
Notes: svn path=/head/; revision=231714
Diffstat (limited to 'include/runetype.h')
-rw-r--r--include/runetype.h20
1 files changed, 5 insertions, 15 deletions
diff --git a/include/runetype.h b/include/runetype.h
index 5aeea093ca13..c33ea2b6904f 100644
--- a/include/runetype.h
+++ b/include/runetype.h
@@ -85,21 +85,11 @@ typedef struct {
#define _RUNE_MAGIC_1 "RuneMagi" /* Indicates version 0 of RuneLocale */
__BEGIN_DECLS
extern const _RuneLocale _DefaultRuneLocale;
-extern const _RuneLocale *_CurrentRuneLocale;
-#if defined(__NO_TLS) || defined(__RUNETYPE_INTERNAL)
-extern const _RuneLocale *__getCurrentRuneLocale(void);
-#else
-extern const _Thread_local _RuneLocale *_ThreadRuneLocale;
-static inline const _RuneLocale *__getCurrentRuneLocale(void)
-{
-
- if (_ThreadRuneLocale)
- return _ThreadRuneLocale;
- if (_CurrentRuneLocale)
- return _CurrentRuneLocale;
- return &_DefaultRuneLocale;
-}
-#endif /* __NO_TLS || __RUNETYPE_INTERNAL */
+__attribute__((deprecated))
+extern _RuneLocale *_CurrentRuneLocale;
+/* TODO: This is called quite a lot, so we should use a __thread variable when
+ * it's available. */
+extern _RuneLocale *__getCurrentRuneLocale(void);
#define _CurrentRuneLocale (__getCurrentRuneLocale())
__END_DECLS