--- Libc/Libc-583/include/pwd.h
+++ Libc/Libc-391/include/pwd.h
@@ -83,7 +83,7 @@
 #define _UID_T
 #endif
 
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#ifndef _POSIX_C_SOURCE
 #define	_PATH_PWD		"/etc"
 #define	_PATH_PASSWD		"/etc/passwd"
 #define	_PASSWD			"passwd"
@@ -137,11 +137,11 @@
 int		 getpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **);
 int		 getpwnam_r(const char *, struct passwd *, char *, size_t, struct passwd **);
 struct passwd	*getpwent(void);
-#if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || defined(_DARWIN_C_SOURCE)
+#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
 int		 setpassent(int);
 char 		*user_from_uid(uid_t, int);
 #endif
-void		 setpwent(void);
+int		 setpwent(void);
 void		 endpwent(void);
 __END_DECLS