[src/trunk]: src/usr.sbin/pwd_mkdb Attempt 2 at fixing DragonFly util.h confl...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bc5bf6289374
branches:  trunk
changeset: 782928:bc5bf6289374
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Nov 26 20:13:54 2012 +0000

description:
Attempt 2 at fixing DragonFly util.h conflicts: include util.h only for
non-tool builds.
(why does the tool build prefer host headers instead of compat headers?)

diffstat:

 usr.sbin/pwd_mkdb/pwd_mkdb.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 1a123a0b64e7 -r bc5bf6289374 usr.sbin/pwd_mkdb/pwd_mkdb.c
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c      Mon Nov 26 20:03:40 2012 +0000
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c      Mon Nov 26 20:13:54 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pwd_mkdb.c,v 1.55 2011/08/31 16:24:59 plunky Exp $     */
+/*     $NetBSD: pwd_mkdb.c,v 1.56 2012/11/26 20:13:54 pooka Exp $      */
 
 /*
  * Copyright (c) 2000, 2009 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
  The NetBSD Foundation, Inc.  All rights reserved.\
   Copyright (c) 1991, 1993, 1994\
  The Regents of the University of California.  All rights reserved.");
-__RCSID("$NetBSD: pwd_mkdb.c,v 1.55 2011/08/31 16:24:59 plunky Exp $");
+__RCSID("$NetBSD: pwd_mkdb.c,v 1.56 2012/11/26 20:13:54 pooka Exp $");
 #endif /* not lint */
 
 #if HAVE_NBTOOL_CONFIG_H
@@ -119,7 +119,10 @@
 #include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
+
+#ifndef HAVE_NBTOOL_CONFIG_H
 #include <util.h>
+#endif
 
 #define        MAX_CACHESIZE   8*1024*1024
 #define        MIN_CACHESIZE   2*1024*1024