===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/pwd.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/include/pwd.h	2004/07/13 21:09:47	1.17
--- src/include/pwd.h	2005/12/13 00:35:22	1.18
***************
*** 1,4 ****
! /*	$OpenBSD: pwd.h,v 1.17 2004/07/13 21:09:47 millert Exp $	*/
  /*	$NetBSD: pwd.h,v 1.9 1996/05/15 21:36:45 jtc Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: pwd.h,v 1.18 2005/12/13 00:35:22 millert Exp $	*/
  /*	$NetBSD: pwd.h,v 1.9 1996/05/15 21:36:45 jtc Exp $	*/
  
  /*-
***************
*** 41,49 ****
  #ifndef _PWD_H_
  #define	_PWD_H_
  
  #include <sys/types.h>
  
! #ifndef _POSIX_SOURCE
  #define	_PATH_PASSWD		"/etc/passwd"
  #define	_PATH_MASTERPASSWD	"/etc/master.passwd"
  #define	_PATH_MASTERPASSWD_LOCK	"/etc/ptmp"
--- 41,50 ----
  #ifndef _PWD_H_
  #define	_PWD_H_
  
+ #include <sys/cdefs.h>
  #include <sys/types.h>
  
! #if __BSD_VISIBLE
  #define	_PATH_PASSWD		"/etc/passwd"
  #define	_PATH_MASTERPASSWD	"/etc/master.passwd"
  #define	_PATH_MASTERPASSWD_LOCK	"/etc/ptmp"
***************
*** 89,111 ****
  	time_t	pw_expire;		/* account expiration */
  };
  
- #include <sys/cdefs.h>
- 
  __BEGIN_DECLS
  struct passwd	*getpwuid(uid_t);
  struct passwd	*getpwnam(const char *);
! #ifndef _POSIX_SOURCE
  struct passwd	*getpwent(void);
! #ifndef _XOPEN_SOURCE
  int		 setpassent(int);
  char		*user_from_uid(uid_t, int);
  char		*bcrypt_gensalt(u_int8_t);
  char		*bcrypt(const char *, const char *);
  char		*md5crypt(const char *, const char *);
  struct passwd	*pw_dup(const struct passwd *);
- #endif
- void		 setpwent(void);
- void		 endpwent(void);
  #endif
  __END_DECLS
  
--- 90,110 ----
  	time_t	pw_expire;		/* account expiration */
  };
  
  __BEGIN_DECLS
  struct passwd	*getpwuid(uid_t);
  struct passwd	*getpwnam(const char *);
! #if __BSD_VISIBLE || __XPG_VISIBLE
  struct passwd	*getpwent(void);
! void		 setpwent(void);
! void		 endpwent(void);
! #endif
! #if __BSD_VISIBLE
  int		 setpassent(int);
  char		*user_from_uid(uid_t, int);
  char		*bcrypt_gensalt(u_int8_t);
  char		*bcrypt(const char *, const char *);
  char		*md5crypt(const char *, const char *);
  struct passwd	*pw_dup(const struct passwd *);
  #endif
  __END_DECLS