diff options
author | dim <dim@FreeBSD.org> | 2012-03-06 20:15:23 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2012-03-06 20:15:23 +0000 |
commit | b8d73c5617e43cf28eead705d64307c7fe69dd80 (patch) | |
tree | a81617b9ac3d53e27933e55119708bd24d768851 /include | |
parent | 9906b913d94518630c70e4da3cbcb4e7a5aab808 (diff) | |
download | FreeBSD-src-b8d73c5617e43cf28eead705d64307c7fe69dd80.zip FreeBSD-src-b8d73c5617e43cf28eead705d64307c7fe69dd80.tar.gz |
After r232498, programs built with -ansi or -std=c89 including <ctype.h>
would not compile anymore, due to plain 'inline' keywords. Fix this by
using __inline instead.
Reported by: Jia-Shiun Li <jiashiun@gmail.com>
Discussed with: theraven
Diffstat (limited to 'include')
-rw-r--r-- | include/runetype.h | 2 | ||||
-rw-r--r-- | include/xlocale/_ctype.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/runetype.h b/include/runetype.h index 972242a..6aad915 100644 --- a/include/runetype.h +++ b/include/runetype.h @@ -90,7 +90,7 @@ extern const _RuneLocale *_CurrentRuneLocale; extern const _RuneLocale *__getCurrentRuneLocale(void); #else extern _Thread_local const _RuneLocale *_ThreadRuneLocale; -static inline const _RuneLocale *__getCurrentRuneLocale(void) +static __inline const _RuneLocale *__getCurrentRuneLocale(void) { if (_ThreadRuneLocale) diff --git a/include/xlocale/_ctype.h b/include/xlocale/_ctype.h index d0e5a47..31359b7 100644 --- a/include/xlocale/_ctype.h +++ b/include/xlocale/_ctype.h @@ -55,11 +55,11 @@ _RuneLocale *__runes_for_locale(locale_t, int*); #ifndef _XLOCALE_INLINE #if __GNUC__ && !__GNUC_STDC_INLINE__ /* GNU89 inline has nonstandard semantics. */ -#define _XLOCALE_INLINE extern inline +#define _XLOCALE_INLINE extern __inline #else /* Hack to work around people who define inline away */ #ifdef inline -#define _XLOCALE_INLINE __inline static +#define _XLOCALE_INLINE static __inline #else /* Define with C++ / C99 compatible semantics */ #define _XLOCALE_INLINE inline |