mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-02 08:42:48 +00:00
Code Issues Releases Activity

After r232498, programs built with -ansi or -std=c89 including <ctype.h>

Browse Source 
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
This commit is contained in:
Dimitry Andric 2012-03-06 20:15:23 +00:00
parent 9c170fd168
commit b1e45245d1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=232620
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/runetype.h
View File

@ -90,7 +90,7 @@ extern const _RuneLocale *_CurrentRuneLocale;
extern const _RuneLocale *__getCurrentRuneLocale(void); extern const _RuneLocale *__getCurrentRuneLocale(void);
#else #else
extern _Thread_local const _RuneLocale *_ThreadRuneLocale; extern _Thread_local const _RuneLocale *_ThreadRuneLocale;
static inline const _RuneLocale *__getCurrentRuneLocale(void) static __inline const _RuneLocale *__getCurrentRuneLocale(void)
{ {
if (_ThreadRuneLocale) if (_ThreadRuneLocale)

4
include/xlocale/_ctype.h
View File

@ -55,11 +55,11 @@ _RuneLocale *__runes_for_locale(locale_t, int*);
#ifndef _XLOCALE_INLINE #ifndef _XLOCALE_INLINE
#if __GNUC__ && !__GNUC_STDC_INLINE__ #if __GNUC__ && !__GNUC_STDC_INLINE__
/* GNU89 inline has nonstandard semantics. */ /* GNU89 inline has nonstandard semantics. */
#define _XLOCALE_INLINE extern inline #define _XLOCALE_INLINE extern __inline
#else #else
/* Hack to work around people who define inline away */ /* Hack to work around people who define inline away */
#ifdef inline #ifdef inline
#define _XLOCALE_INLINE __inline static #define _XLOCALE_INLINE static __inline
#else #else
/* Define with C++ / C99 compatible semantics */ /* Define with C++ / C99 compatible semantics */
#define _XLOCALE_INLINE inline #define _XLOCALE_INLINE inline