From owner-svn-src-all@FreeBSD.ORG  Tue Mar  6 20:15:24 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4371B1065672;
	Tue,  6 Mar 2012 20:15:24 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 332F98FC0A;
	Tue,  6 Mar 2012 20:15:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q26KFOD9055746;
	Tue, 6 Mar 2012 20:15:24 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q26KFNJA055743;
	Tue, 6 Mar 2012 20:15:23 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201203062015.q26KFNJA055743@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 6 Mar 2012 20:15:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232620 - in head/include: . xlocale
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Mar 2012 20:15:24 -0000

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