Re: build failure w/ latest quota merge

[Manuel Bouyer <bouyer%antioche.eu.org@localhost>]

On Thu, Mar 24, 2011 at 08:02:32PM +0000, bch%methodlogic.net@localhost wrote:
> 
> More complete paste:
> 
> #   compile  makefs/ffs_bswap.lo^M
> cc -O -I. -I/usr/src/obj/tooldir.NetBSD-5.99.48-amd64/include/nbinclude 
> -I/usr/src/obj/tooldir.NetBSD-5.99.48-amd64/include 
> -I/usr/src/tools/compat/obj -I/usr/src/tools/compat/obj/include 
> -I/usr/src/tools/makefs/
> ../compat -DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64 
> -I/usr/src/tools/makefs/../../usr.sbin/makefs -I/usr/src/sbin/mknod 
> -I/usr/src/usr.sbin/mtree -I/usr/src/sys/fs/cd9660 -c -o ffs_bswap.lo.o    
> /usr/src/sy
> s/ufs/ffs/ffs_bswap.c^M
> In file included from /usr/src/sys/ufs/ffs/ffs_bswap.c:41:^M
> /usr/src/obj/tooldir.NetBSD-5.99.48-amd64/include/nbinclude/ufs/ufs/quota.h:39:29:
>  error: quota/quotaprop.h: No such file or directory^M

Strange, it builds fine for me.
On what host is this ?
can you try the attached patch ?

-- 
Manuel Bouyer <bouyer%antioche.eu.org@localhost>
     NetBSD: 26 ans d'experience feront toujours la difference
--

Index: ufs/ufs/quota.h
===================================================================
RCS file: /cvsroot/src/sys/ufs/ufs/quota.h,v
retrieving revision 1.27
diff -u -r1.27 quota.h
--- ufs/ufs/quota.h     24 Mar 2011 17:05:45 -0000      1.27
+++ ufs/ufs/quota.h     24 Mar 2011 23:18:28 -0000
@@ -36,7 +36,6 @@
 
 #ifndef        _UFS_UFS_QUOTA_H_
 #define        _UFS_UFS_QUOTA_H_
-#include <quota/quotaprop.h>
 
 /*
  * These definitions are common to the original disk quota implementation
@@ -55,6 +54,8 @@
 #define        GRPQUOTA        1       /* element used for group quotas */
 
 
+#if !defined(HAVE_NBTOOL_CONFIG_H)
+#include <quota/quotaprop.h>
 __inline static int __unused
 ufsclass2qtype(int class)
 {
@@ -80,6 +81,7 @@
                return -1;
        }
 }
+#endif /* !defined(HAVE_NBTOOL_CONFIG_H) */
 
 #ifdef _KERNEL