Module Name: src
Committed By: pooka
Date: Mon Nov 26 17:18:40 UTC 2012
Modified Files:
src/include: pwd.h
Log Message:
When including this from a tools build, avoid defining _PWD_H_ since
that macro causes DragonFly's util.h to define conflicting routines.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/include/pwd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/pwd.h
diff -u src/include/pwd.h:1.42 src/include/pwd.h:1.43
--- src/include/pwd.h:1.42 Sun Jan 11 03:04:12 2009
+++ src/include/pwd.h Mon Nov 26 17:18:39 2012
@@ -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>
