From owner-freebsd-current Wed May 7 13:08:43 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id NAA12612 for current-outgoing; Wed, 7 May 1997 13:08:43 -0700 (PDT) Received: from bitbox.follo.net (bitbox.follo.net [194.198.43.36]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id NAA12585 for ; Wed, 7 May 1997 13:08:37 -0700 (PDT) Received: (from eivind@localhost) by bitbox.follo.net (8.7.6/8.7.3) id WAA25711; Wed, 7 May 1997 22:08:03 +0200 (MET DST) Date: Wed, 7 May 1997 22:08:03 +0200 (MET DST) Message-Id: <199705072008.WAA25711@bitbox.follo.net> From: Eivind Eklund To: Ollivier Robert CC: freebsd-current@FreeBSD.ORG In-reply-to: Ollivier Robert's message of Wed, 7 May 1997 19:28:23 +0200 Subject: Re: #define conflict in #include files References: <19970507192823.63776@keltia.freenix.fr> 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... > > Both fts.h & link.h were changed today by Julian Assage's patch, probably > to add #include ... > > "make world" is broken of course. :-( The changes have been reverted now. > I don't really know how to fix that except either fix the name space > conflict or revert as before. I'll try to fix the name space conflict. N_SIZE is used three places in find - I've changed it to N_SIZE_ARG locally (as it is an argument to find) which clashes a bit with the other names in find, but is the cleanest compromise I could find. Changing all the names in seems to be going a bit overboard; that would make accepting patches from other groups and versions difficult. Or would people rather we left all include files non-self-sufficient for the foreseeable future and let the conflict lie? Eivind.