--- Libc/Libc-262/include/pwd.h
+++ Libc/Libc-320/include/pwd.h
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -111,17 +114,18 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-struct passwd	*getpwuid __P((uid_t));
-struct passwd	*getpwnam __P((const char *));
-int		 getpwuid_r __P((uid_t, struct passwd *, char *, size_t, struct passwd **));
-int		 getpwnam_r __P((const char *, struct passwd *, char *, size_t, struct passwd **));
+struct passwd	*getpwuid(uid_t);
+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 __P((void));
+struct passwd	*getpwent(void);
 #ifndef _XOPEN_SOURCE
-int		 setpassent __P((int));
+int		 setpassent(int);
+char 		*user_from_uid(uid_t, int);
 #endif
-int		 setpwent __P((void));
-void		 endpwent __P((void));
+int		 setpwent(void);
+void		 endpwent(void);
 #endif
 __END_DECLS