Date: Tue, 6 Mar 2012 20:15:23 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r232620 - in head/include: . xlocale Message-ID: <201203062015.q26KFNJA055743@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Tue Mar 6 20:15:23 2012 New Revision: 232620 URL: http://svn.freebsd.org/changeset/base/232620 Log: 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 Modified: head/include/runetype.h head/include/xlocale/_ctype.h Modified: head/include/runetype.h ============================================================================== --- head/include/runetype.h Tue Mar 6 20:01:25 2012 (r232619) +++ head/include/runetype.h Tue Mar 6 20:15:23 2012 (r232620) @@ -90,7 +90,7 @@ extern const _RuneLocale *_CurrentRuneLo 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) Modified: head/include/xlocale/_ctype.h ============================================================================== --- head/include/xlocale/_ctype.h Tue Mar 6 20:01:25 2012 (r232619) +++ head/include/xlocale/_ctype.h Tue Mar 6 20:15:23 2012 (r232620) @@ -55,11 +55,11 @@ _RuneLocale *__runes_for_locale(locale_t #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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203062015.q26KFNJA055743>