summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorpooka <pooka@NetBSD.org>2012-11-26 17:18:39 +0000
committerpooka <pooka@NetBSD.org>2012-11-26 17:18:39 +0000
commitfad02285d219dff9531365ff7b39f17a1e06c65a (patch)
tree1ae97ce49857b045acbf38d2ab3ee5c6f16f1b40 /include
parentc386db6b3e1f43a26727cde0994ddedb95c80add (diff)
When including this from a tools build, avoid defining _PWD_H_ since
that macro causes DragonFly's util.h to define conflicting routines.
Diffstat (limited to 'include')
-rw-r--r--include/pwd.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/include/pwd.h b/include/pwd.h
index 4a471f02748..1fd484c9cd6 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>