From owner-freebsd-current Wed May 7 10:29:44 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id KAA03351 for current-outgoing; Wed, 7 May 1997 10:29:44 -0700 (PDT) Received: from mexico.brainstorm.eu.org (root@mexico.brainstorm.fr [193.56.58.253]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id KAA03342 for ; Wed, 7 May 1997 10:29:40 -0700 (PDT) Received: from brasil.brainstorm.eu.org (brasil.brainstorm.fr [193.56.58.33]) by mexico.brainstorm.eu.org (8.8.4/8.8.4) with ESMTP id TAA20687 for ; Wed, 7 May 1997 19:29:34 +0200 Received: (from uucp@localhost) by brasil.brainstorm.eu.org (8.8.4/8.6.12) with UUCP id TAA10710 for freebsd-current@FreeBSD.ORG; Wed, 7 May 1997 19:29:16 +0200 Received: (from roberto@localhost) by keltia.freenix.fr (8.8.5/keltia-uucp-2.9) id TAA16690; Wed, 7 May 1997 19:28:24 +0200 (CEST) Message-ID: <19970507192823.63776@keltia.freenix.fr> Date: Wed, 7 May 1997 19:28:23 +0200 From: Ollivier Robert To: "FreeBSD Current Users' list" Subject: #define conflict in #include files Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 0.67 X-Operating-System: FreeBSD 3.0-CURRENT ctm#3279 Sender: owner-current@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk After the recent #include changes (see my other report where reverting to older versions of ypcnlt.h & yp_prot.h fixed "make world"), there is a name conflict between which defines N_SIZE to 0x0c and usr.bin/find/find.h which uses N_SIZE as an enum member... 203 [19:18] root@keltia:usr.bin/find# make cc -O -pipe -D_NEW_VFSCONF -c /src/src/usr.bin/find/find.c In file included from /src/src/usr.bin/find/find.c:51: /src/src/usr.bin/find/find.h:45: parse error before `0x0c' *** Error code 1 Stop. 205 [19:20] root@keltia:usr.bin/find# grep 0x0c ../../include/*.h ../../include/nlist.h:#define N_SIZE 0x0c /* pseudo type, defines a symbol's size */ 207 [19:20] root@keltia:usr.bin/find# cd ../../include/ 210 [19:20] root@keltia:src/include# grep nlist\\.h * Makefile: ndbm.h netdb.h nl_types.h nlist.h paths.h pthread.h pthread_np.h pwd.h \ a.out.h:#include fts.h:#include kvm.h:#include link.h:#include nlist.h: * @(#)nlist.h 8.2 (Berkeley) 1/21/94 nlist.h: * $Id: nlist.h,v 1.5 1997/02/23 09:17:14 peter Exp $ nlist.h: * nlist.h can initialize nlist structures statically. 211 [19:21] root@keltia:src/include# ll fts.h kvm.h link.h -rw-r--r-- 1 roberto staff 5369 May 7 12:51 fts.h -rw-r--r-- 1 roberto staff 3020 Mar 22 1995 kvm.h -rw-r--r-- 1 roberto staff 10589 May 7 12:51 link.h Both fts.h & link.h were changed today by Julian Assage's patch, probably to add #include ... "make world" is broken of course. I don't really know how to fix that except either fix the name space conflict or revert as before. -- Ollivier ROBERT -=- FreeBSD: There are no limits -=- roberto@keltia.freenix.fr FreeBSD keltia.freenix.fr 3.0-CURRENT #8: Wed May 7 13:25:41 CEST 1997