[src/trunk]: src/include When including this from a tools build, avoid defini...

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

details:   https://anonhg.NetBSD.org/src/rev/6a1eefee4073
branches:  trunk
changeset: 782917:6a1eefee4073
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Nov 26 17:18:39 2012 +0000

description:
When including this from a tools build, avoid defining _PWD_H_ since
that macro causes DragonFly's util.h to define conflicting routines.

diffstat:

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

diffs (24 lines):

diff -r 508c5b7b4caa -r 6a1eefee4073 include/pwd.h
--- a/include/pwd.h     Mon Nov 26 17:03:15 2012 +0000
+++ b/include/pwd.h     Mon Nov 26 17:18:39 2012 +0000
@@ -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>