From owner-cvs-src@FreeBSD.ORG  Wed Sep 14 16:53:18 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B3EB916A41F;
	Wed, 14 Sep 2005 16:53:18 +0000 (GMT)
	(envelope-from stefan@fafoe.narf.at)
Received: from viefep17-int.chello.at (viefep17-int.chello.at [213.46.255.24])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6017243D46;
	Wed, 14 Sep 2005 16:53:17 +0000 (GMT)
	(envelope-from stefan@fafoe.narf.at)
Received: from wombat.fafoe.narf.at ([213.47.85.26]) by viefep17-int.chello.at
	(InterMail vM.6.01.04.04 201-2131-118-104-20050224) with ESMTP id
	<20050914165314.FJQG1234.viefep17-int.chello.at@wombat.fafoe.narf.at>;
	Wed, 14 Sep 2005 18:53:14 +0200
Received: by wombat.fafoe.narf.at (Postfix, from userid 1001)
	id 71F9BB7; Wed, 14 Sep 2005 18:53:02 +0200 (CEST)
Date: Wed, 14 Sep 2005 18:53:02 +0200
From: Stefan Farfeleder <stefanf@FreeBSD.org>
To: Marcel Moolenaar <marcel@xcllnt.net>
Message-ID: <20050914165300.GG59453@wombat.fafoe.narf.at>
References: <200509140901.j8E916mL044612@repoman.freebsd.org>
	<20050914095217.GC59453@wombat.fafoe.narf.at>
	<154E8DB1-C941-4477-9FB7-BD373DC11898@xcllnt.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <154E8DB1-C941-4477-9FB7-BD373DC11898@xcllnt.net>
User-Agent: Mutt/1.5.10i
Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/include Makefile
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Sep 2005 16:53:18 -0000

On Wed, Sep 14, 2005 at 09:30:26AM -0700, Marcel Moolenaar wrote:
> On Sep 14, 2005, at 2:52 AM, Stefan Farfeleder wrote:
> 
> >>  Back out 1.247.  On ia64 <osreldate.h> is included from  
> >>assembler source,
> >>  the prototype broke buildword.
> >
> >I waver between guarding the prototype with #ifndef __ASSEMBLER__ and
> >moving it to another header, eg. <unistd.h>.  Opinions?
> 
> I would go with #ifndef __ASSEMBLER__. I think the prototype is
> essentially in the right header. I did test your patch and it does
> the trick...

That would require fixing xorg-server's usage of the header too.  I
don't know how difficult this is.

Stefan