From b1e45245d102463578a0219cd7cc24c6bf4e4fde Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Tue, 6 Mar 2012 20:15:23 +0000 Subject: [PATCH] After r232498, programs built with -ansi or -std=c89 including would not compile anymore, due to plain 'inline' keywords. Fix this by using __inline instead. Reported by: Jia-Shiun Li Discussed with: theraven --- include/runetype.h | 2 +- include/xlocale/_ctype.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/runetype.h b/include/runetype.h index 972242a6016..6aad915b560 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 d0e5a473d40..31359b772e3 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