--- Libc/Libc-391/include/pwd.h
+++ Libc/Libc-320/include/pwd.h
@@ -2,6 +2,8 @@
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
@@ -66,35 +68,15 @@
 #ifndef _PWD_H_
 #define	_PWD_H_
 
-#include <_types.h>
+#include <sys/types.h>
 
-#ifndef _GID_T
-typedef __darwin_gid_t		gid_t;
-#define _GID_T
-#endif
-
-#ifndef _SIZE_T
-#define _SIZE_T
-typedef	__darwin_size_t		size_t;
-#endif
-
-#ifndef _UID_T
-typedef __darwin_uid_t		uid_t;
-#define _UID_T
-#endif
-
-#ifndef _POSIX_C_SOURCE
-#define	_PATH_PWD		"/etc"
+#ifndef _POSIX_SOURCE
 #define	_PATH_PASSWD		"/etc/passwd"
-#define	_PASSWD			"passwd"
 #define	_PATH_MASTERPASSWD	"/etc/master.passwd"
 #define	_PATH_MASTERPASSWD_LOCK	"/etc/ptmp"
-#define	_MASTERPASSWD		"master.passwd"
 
 #define	_PATH_MP_DB		"/etc/pwd.db"
-#define	_MP_DB			"pwd.db"
 #define	_PATH_SMP_DB		"/etc/spwd.db"
-#define	_SMP_DB			"spwd.db"
 
 #define	_PATH_PWD_MKDB		"/usr/sbin/pwd_mkdb"
 
@@ -121,12 +103,12 @@
 	char	*pw_passwd;		/* encrypted password */
 	uid_t	pw_uid;			/* user uid */
 	gid_t	pw_gid;			/* user gid */
-	__darwin_time_t pw_change;		/* password change time */
+	time_t	pw_change;		/* password change time */
 	char	*pw_class;		/* user access class */
 	char	*pw_gecos;		/* Honeywell login info */
 	char	*pw_dir;		/* home directory */
 	char	*pw_shell;		/* default shell */
-	__darwin_time_t pw_expire;		/* account expiration */
+	time_t	pw_expire;		/* account expiration */
 };
 
 #include <sys/cdefs.h>
@@ -136,13 +118,15 @@
 struct passwd	*getpwnam(const char *);
 int		 getpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **);
 int		 getpwnam_r(const char *, struct passwd *, char *, size_t, struct passwd **);
+#ifndef _POSIX_SOURCE
 struct passwd	*getpwent(void);
-#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
+#ifndef _XOPEN_SOURCE
 int		 setpassent(int);
 char 		*user_from_uid(uid_t, int);
 #endif
 int		 setpwent(void);
 void		 endpwent(void);
+#endif
 __END_DECLS
 
 #endif /* !_PWD_H_ */