Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/include/grp.h,v
retrieving revision 1.20.2.2
retrieving revision 1.21
diff -u -p -r1.20.2.2 -r1.21
--- src/include/grp.h	2005/07/11 21:32:35	1.20.2.2
+++ src/include/grp.h	2005/04/02 04:54:35	1.21
@@ -1,4 +1,4 @@
-/*	$NetBSD: grp.h,v 1.20.2.2 2005/07/11 21:32:35 tron Exp $	*/
+/*	$NetBSD: grp.h,v 1.21 2005/04/02 04:54:35 christos Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -57,17 +57,14 @@ struct group {
 __BEGIN_DECLS
 struct group	*getgrgid(gid_t);
 struct group	*getgrnam(const char *);
-#if (_POSIX_C_SOURCE - 0) >= 199506L || (_XOPEN_SOURCE - 0) >= 500 || \
-    defined(_REENTRANT) || defined(_NETBSD_SOURCE)
-int		 getgrgid_r(gid_t, struct group *, char *, size_t,
-				struct group **);
-int		 getgrnam_r(const char *, struct group *, char *, size_t,
-				struct group **);
-#endif
 #if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE)
 struct group	*getgrent(void);
 void		 setgrent(void);
 void		 endgrent(void);
+int		 getgrgid_r(gid_t, struct group *, char *, size_t,
+				struct group **);
+int		 getgrnam_r(const char *, struct group *, char *, size_t,
+				struct group **);
 #endif
 #if defined(_NETBSD_SOURCE)
 void		 setgrfile(const char *);