From owner-freebsd-questions  Sun Jan  4 07:59:14 1998
Return-Path: <owner-freebsd-questions>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id HAA04500
          for questions-outgoing; Sun, 4 Jan 1998 07:59:14 -0800 (PST)
          (envelope-from owner-freebsd-questions)
Received: from fly.HiWAAY.net (root@fly.HiWAAY.net [208.147.154.56])
          by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id HAA04495
          for <freebsd-questions@freebsd.org>; Sun, 4 Jan 1998 07:59:10 -0800 (PST)
          (envelope-from sprice@hiwaay.net)
Received: from bonsai.hiwaay.net (tnt1-112.HiWAAY.net [208.147.147.112])
	by fly.HiWAAY.net (8.8.8/8.8.6) with SMTP id JAA31220;
	Sun, 4 Jan 1998 09:58:53 -0600 (CST)
Message-ID: <34AFB215.69D8BD19@hiwaay.net>
Date: Sun, 04 Jan 1998 10:00:21 -0600
From: Steve Price <sprice@hiwaay.net>
X-Mailer: Mozilla 3.04Gold (X11; I; FreeBSD 3.0-CURRENT i386)
MIME-Version: 1.0
To: freebsd-questions@freebsd.org
CC: msmith@3-cities.com
Subject: Re: 2.2.5 Stable make kernel failure
References: <34AF5C2C.5F7@3-cities.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-questions@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

Mark Smith wrote:
> 
> Greetings,
> 
> I did a virgin install of 2.2.5 Release (off of the Walnut Creek
> CD) and then did a CVSup to 2.2.5 Stable (tag=RELENG_2_2).  Then
> I went to the /sys/i386/conf and did a config GENERIC, cd
> /sys/compile/GENERIC, make depend and finally a make.  This is
> the GENERIC config file as on the CD and stable distributions
> with NO mods by me and here's the make output
> 
[...]
> In file included from ../../sys/types.h:95,
>                  from ../../sys/param.h:54,
>                  from vnode_if.c:8:
> machine/endian.h:63: syntax error before `unsigned'
> machine/endian.h:63: parse error before `__P'
> machine/endian.h:64: parse error before `__P'
> machine/endian.h:65: parse error before `__P'
> machine/endian.h:66: parse error before `__P'
> In file included from ../../sys/param.h:54,
>                  from vnode_if.c:8:
> ../../sys/types.h:98: syntax error before `typedef'
> *** Error code 1
> 
> Stop.
> 
> Any ideas?

Yes, it seems that I didn't test my commit thoroughly
enough; at least not in the KERNEL case.  Apply the
quick fix below and let me know what happens.

Thanks, Steve

Index: endian.h
===================================================================
RCS file: /u/FreeBSD/cvs/src/sys/i386/include/endian.h,v
retrieving revision 1.7.2.1
diff -u -r1.7.2.1 endian.h
--- endian.h	1998/01/04 04:26:38	1.7.2.1
+++ endian.h	1998/01/04 15:55:10
@@ -57,7 +57,6 @@
 
 #ifndef KERNEL
 #include <sys/cdefs.h>
-#endif
 
 __BEGIN_DECLS
 unsigned long	htonl __P((unsigned long));
@@ -65,6 +64,8 @@
 unsigned long	ntohl __P((unsigned long));
 unsigned short	ntohs __P((unsigned short));
 __END_DECLS
+
+#endif /* !KERNEL */
 
 #define __word_swap_long(x) \
 ({ register u_long __X = (x); \