diff options
| author | dim <dim@FreeBSD.org> | 2012-02-14 21:48:46 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2012-02-14 21:48:46 +0000 |
| commit | 22f749d90e97e5b3ffa074fbef5cdaf4ee857388 (patch) | |
| tree | 00a985b9380f82c7f307d0bcf2af19ad578ceabb /include/runetype.h | |
| parent | 2a66ed0b53bbc14ffa0439fc20727b37655fdaf3 (diff) | |
| download | FreeBSD-src-22f749d90e97e5b3ffa074fbef5cdaf4ee857388.zip FreeBSD-src-22f749d90e97e5b3ffa074fbef5cdaf4ee857388.tar.gz | |
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
Diffstat (limited to 'include/runetype.h')
| -rw-r--r-- | include/runetype.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/include/runetype.h b/include/runetype.h index 5aeea09..c33ea2b 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 |
