Rather than include namespace pollution in <grp.h> in order to declare

`gid_t', use the canonical protection scheme to define a type in two or
more headers.  This brings <grp.h> closer to POSIX.1-2001 conformance.

1 files changed, 5 insertions, 1 deletions

diff --git a/include/grp.h b/include/grp.h
index abd88ef18153..07a4e454f2ec 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -42,13 +42,17 @@
 #ifndef _GRP_H_
 #define	_GRP_H_
 
-#include <sys/types.h>
 #include <sys/cdefs.h>
 
 #ifndef _POSIX_SOURCE
 #define	_PATH_GROUP		"/etc/group"
 #endif
 
+#ifndef _GID_T_DECLARED
+#define	_GID_T_DECLARED
+typedef	u_int32_t	gid_t;
+#endif
+
 struct group {
 	char	*gr_name;		/* group name */
 	char	*gr_passwd;		/* group password */