From owner-freebsd-current  Wed Oct 25 23:21:46 2000
Delivered-To: freebsd-current@freebsd.org
Received: from palrel3.hp.com (palrel3.hp.com [156.153.255.226])
	by hub.freebsd.org (Postfix) with ESMTP
	id 4C32837B479; Wed, 25 Oct 2000 23:21:43 -0700 (PDT)
Received: from adlmail.cup.hp.com (adlmail.cup.hp.com [15.0.100.30])
	by palrel3.hp.com (Postfix) with ESMTP
	id E7D872D6A; Wed, 25 Oct 2000 23:21:42 -0700 (PDT)
Received: from cup.hp.com (p1000180.nsr.hp.com [15.109.0.180])
	by adlmail.cup.hp.com (8.9.3 (PHNE_18546)/8.9.3 SMKit7.02) with ESMTP id XAA07446;
	Wed, 25 Oct 2000 23:21:30 -0700 (PDT)
Message-ID: <39F7CD64.771B6436@cup.hp.com>
Date: Wed, 25 Oct 2000 23:21:24 -0700
From: Marcel Moolenaar <marcel@cup.hp.com>
Organization: Hewlett-Packard
X-Mailer: Mozilla 4.73 [en] (X11; U; Linux 2.2.12 i386)
X-Accept-Language: en
MIME-Version: 1.0
To: Patrick Gardella <patrick@FreeBSD.ORG>
Cc: current@FreeBSD.ORG, jmz@FreeBSD.ORG
Subject: Re: XFree86 3.3.6_3 build dies on -current
References: <39F59863.803D40E9@freebsd.org>
Content-Type: multipart/mixed;
 boundary="------------140E3120177FFEFD8750EFE0"
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

This is a multi-part message in MIME format.
--------------140E3120177FFEFD8750EFE0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Patrick Gardella wrote:
> 
> In file included from /usr/include/sys/wait.h:93,
>                  from vgaHW.c:44:
> /usr/include/machine/endian.h:72: syntax error before
> `__uint16_swap_unit32'
> /usr/include/machine/endian.h:72: syntax error before `__x'
> <snip>
> 

The following 2 patches solve the problem when building XFree86-3.3.6
with only the VGA16 and SVGA servers. Building other servers may still
be broken.

The patches are relative to .../XFree86/work

FYI,

-- 
Marcel Moolenaar
  mail: marcel@cup.hp.com / marcel@FreeBSD.org
  tel:  (408) 447-4222
--------------140E3120177FFEFD8750EFE0
Content-Type: text/plain; charset=us-ascii;
 name="X1.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="X1.diff"

--- xc/programs/Xserver/hw/xfree86/vga16/vga/vgaHW.c~	Wed Oct 25 23:08:19 2000
+++ xc/programs/Xserver/hw/xfree86/vga16/vga/vgaHW.c	Wed Oct 25 23:05:33 2000
@@ -38,7 +38,7 @@
 #include <sys/wait.h>
 #undef _POSIX_SOURCE
 #else
-#if defined(MINIX) || defined(AMOEBA) || (defined(ISC) && defined(_POSIX_SOURCE)) || defined(Lynx)
+#if defined(MINIX) || defined(AMOEBA) || (defined(ISC) && defined(_POSIX_SOURCE)) || defined(Lynx) || defined(__FreeBSD__)
 #include <sys/types.h>
 #endif
 #include <sys/wait.h>

--------------140E3120177FFEFD8750EFE0
Content-Type: text/plain; charset=us-ascii;
 name="X2.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="X2.diff"

--- xc/programs/Xserver/hw/xfree86/vga256/drivers/tdfx/vb_vgahw.c~	Wed Oct 25 23:11:33 2000
+++ xc/programs/Xserver/hw/xfree86/vga256/drivers/tdfx/vb_vgahw.c	Wed Oct 25 23:12:10 2000
@@ -40,7 +40,7 @@
 #include <sys/wait.h>
 #undef _POSIX_SOURCE
 #else
-#if defined(MINIX) || defined(AMOEBA) || (defined(ISC) && defined(_POSIX_SOURCE)) || defined(Lynx)
+#if defined(MINIX) || defined(AMOEBA) || (defined(ISC) && defined(_POSIX_SOURCE)) || defined(Lynx) || defined(__FreeBSD__)
 #include <sys/types.h>
 #endif
 #include <sys/wait.h>

--------------140E3120177FFEFD8750EFE0--



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message