From owner-svn-src-head@FreeBSD.ORG  Tue Mar 13 18:33:10 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8B5CA1065672;
	Tue, 13 Mar 2012 18:33:10 +0000 (UTC)
	(envelope-from andreast@FreeBSD.org)
Received: from smtp.fgznet.ch (mail.fgznet.ch [81.92.96.47])
	by mx1.freebsd.org (Postfix) with ESMTP id 2206B8FC1E;
	Tue, 13 Mar 2012 18:33:09 +0000 (UTC)
Received: from deuterium.andreas.nets (dhclient-91-190-14-19.flashcable.ch
	[91.190.14.19])
	by smtp.fgznet.ch (8.13.8/8.13.8/Submit_SMTPAUTH) with ESMTP id
	q2DIIk2i028232; Tue, 13 Mar 2012 19:18:47 +0100 (CET)
	(envelope-from andreast@FreeBSD.org)
Message-ID: <4F5F8F86.1060500@FreeBSD.org>
Date: Tue, 13 Mar 2012 19:18:46 +0100
From: Andreas Tobler <andreast@FreeBSD.org>
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.5;
	rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2
MIME-Version: 1.0
To: David Chisnall <theraven@FreeBSD.org>
References: <201203131732.q2DHWtQ7054890@svn.freebsd.org>
In-Reply-To: <201203131732.q2DHWtQ7054890@svn.freebsd.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Scanned-By: MIMEDefang 2.64 on 81.92.96.47
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
	src-committers@FreeBSD.org
Subject: Re: svn commit: r232929 - head/include/xlocale
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Mar 2012 18:33:10 -0000

On 13.03.12 18:32, David Chisnall wrote:
> Author: theraven
> Date: Tue Mar 13 17:32:55 2012
> New Revision: 232929
> URL: http://svn.freebsd.org/changeset/base/232929
>
> Log:
>    Fix the other missing prototypes.
>
>    Approved by:	dim (mentor)
>
> Modified:
>    head/include/xlocale/_ctype.h
>
> Modified: head/include/xlocale/_ctype.h
> ==============================================================================
> --- head/include/xlocale/_ctype.h	Tue Mar 13 16:42:39 2012	(r232928)
> +++ head/include/xlocale/_ctype.h	Tue Mar 13 17:32:55 2012	(r232929)
> @@ -69,6 +69,11 @@ _RuneLocale	*__runes_for_locale(locale_t
>
>   #ifdef _XLOCALE_WCTYPES
>   _XLOCALE_INLINE int
> +__maskrune_l(__ct_rune_t __c, unsigned long __f, locale_t __loc);
> +_XLOCALE_INLINE __inline int

Duplicate inline.

> +__istype_l(__ct_rune_t __c, unsigned long __f, locale_t __loc);
> +
> +_XLOCALE_INLINE int
>   __maskrune_l(__ct_rune_t __c, unsigned long __f, locale_t __loc)
>   {
>   	int __limit;

Around line 85 too.

I build with the below diff now.

Gruss,
Andreas

Index: _ctype.h
===================================================================
--- _ctype.h	(revision 232929)
+++ _ctype.h	(working copy)
@@ -70,7 +70,7 @@
  #ifdef _XLOCALE_WCTYPES
  _XLOCALE_INLINE int
  __maskrune_l(__ct_rune_t __c, unsigned long __f, locale_t __loc);
-_XLOCALE_INLINE __inline int
+_XLOCALE_INLINE int
  __istype_l(__ct_rune_t __c, unsigned long __f, locale_t __loc);

  _XLOCALE_INLINE int
@@ -82,7 +82,7 @@
  	       runes->__runetype[__c] & __f;
  }

-_XLOCALE_INLINE __inline int
+_XLOCALE_INLINE int
  __istype_l(__ct_rune_t __c, unsigned long __f, locale_t __loc)
  {
  	return (!!__maskrune_l(__c, __f, __loc));