From owner-freebsd-current  Wed May  7 16:22:20 1997
Return-Path: <owner-current>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id QAA24443
          for current-outgoing; Wed, 7 May 1997 16:22:20 -0700 (PDT)
Received: from helios.dnttm.ru (uutejb@dnttm.wave.ras.ru [194.85.104.197])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id QAA24435
          for <freebsd-current@FreeBSD.ORG>; Wed, 7 May 1997 16:22:16 -0700 (PDT)
Received: (from uutejb@localhost)
	by helios.dnttm.ru (8.8.5/8.8.5/IP-2) with UUCP id DAA18767;
	Thu, 8 May 1997 03:20:59 +0400
Received: from tejblum.dnttm.rssi.ru (localhost [127.0.0.1])
	by tejblum.dnttm.rssi.ru (8.8.5/8.8.5) with ESMTP id DAA01016;
	Wed, 8 Jan 1997 03:19:15 +0300 (MSK)
Message-Id: <199701080019.DAA01016@tejblum.dnttm.rssi.ru>
X-Mailer: exmh version 2.0gamma 1/27/96
To: Eivind Eklund <eivind@bitbox.follo.net>
cc: Ollivier Robert <roberto@keltia.freenix.fr>, freebsd-current@FreeBSD.ORG
Subject: Re: #define conflict in #include files 
In-reply-to: Your message of "Wed, 07 May 1997 22:08:03 +0200."
             <199705072008.WAA25711@bitbox.follo.net> 
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Wed, 08 Jan 1997 03:19:13 +0300
From: Dmitrij Tejblum <dima@tejblum.dnttm.rssi.ru>
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 <nlist.h> 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 <nlist.h>...

Don't #include <nlist.h> into <fts.h>. It is useless. It is bogus. <fts.h>
don't depend on <nlist.h>. Find(1) proves it --- it #include <fts.h>, but
don't #include <nlist.h>.


> Or would people rather we left all include files non-self-sufficient
> for the foreseeable future and let the conflict lie?

You don't need #include <nlist.h> in <fts.h> for making <fts.h> 
self-sufficient. #include <sys/types.h> would be enought.

> 
> Eivind.
> 

Dima