From 1fedf4b3c84073b7826a2a60578bd3bf1f053fee Mon Sep 17 00:00:00 2001
From: pooka <pooka@NetBSD.org>
Date: Mon, 26 Nov 2012 17:18:39 +0000
Subject: [PATCH] When including this from a tools build, avoid defining
 _PWD_H_ since that macro causes DragonFly's util.h to define conflicting
 routines.

---
 include/pwd.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/pwd.h b/include/pwd.h
index 4a471f027488..1fd484c9cd6b 100644
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pwd.h,v 1.42 2009/01/11 03:04:12 christos Exp $	*/
+/*	$NetBSD: pwd.h,v 1.43 2012/11/26 17:18:39 pooka Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -61,8 +61,13 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _PWD_H_
+/* compat stunts to avoid this file defining _PWD_H_ */
+#if !defined(_PWD_H_) && !defined(_COMPAT_PWD_INCLUDED)
+#ifdef _COMPAT_PWD_H_
+#define _COMPAT_PWD_INCLUDED
+#else
 #define	_PWD_H_
+#endif
 
 #include <sys/cdefs.h>
 #include <sys/featuretest.h>