===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/unistd.h,v
retrieving revision 1.92
retrieving revision 1.93
diff -c -r1.92 -r1.93
*** src/include/unistd.h	2014/09/01 05:09:52	1.92
--- src/include/unistd.h	2014/09/18 04:37:56	1.93
***************
*** 1,4 ****
! /*	$OpenBSD: unistd.h,v 1.92 2014/09/01 05:09:52 doug Exp $ */
  /*	$NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: unistd.h,v 1.93 2014/09/18 04:37:56 guenther Exp $ */
  /*	$NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $	*/
  
  /*-
***************
*** 404,418 ****
  int	 ftruncate(int, off_t);
  int	 getlogin_r(char *, size_t)
  		__attribute__((__bounded__(__string__,1,2)));
  #endif
  #if __POSIX_VISIBLE >= 199506
  int	 fdatasync(int);
  #endif
  
  #if __XPG_VISIBLE || __BSD_VISIBLE
- #if __BSD_VISIBLE
- int	crypt_checkpass(const char *, const char *);
- #endif
  char	*crypt(const char *, const char *);
  int	 encrypt(char *, int);
  int	 fchdir(int);
--- 404,417 ----
  int	 ftruncate(int, off_t);
  int	 getlogin_r(char *, size_t)
  		__attribute__((__bounded__(__string__,1,2)));
+ ssize_t	 readlink(const char * __restrict, char * __restrict, size_t)
+ 		__attribute__ ((__bounded__(__string__,2,3)));
  #endif
  #if __POSIX_VISIBLE >= 199506
  int	 fdatasync(int);
  #endif
  
  #if __XPG_VISIBLE || __BSD_VISIBLE
  char	*crypt(const char *, const char *);
  int	 encrypt(char *, int);
  int	 fchdir(int);
***************
*** 424,433 ****
  int	 mkstemp(char *);
  char	*mktemp(char *);
  int	 nice(int);
- ssize_t readlink(const char * __restrict, char * __restrict, size_t)
- 		__attribute__ ((__bounded__(__string__,2,3)));
  int	 setkey(const char *);
- int	 setpgrp(pid_t pid, pid_t pgrp);	/* obsoleted by setpgid() */
  int	 setregid(gid_t, gid_t);
  int	 setreuid(uid_t, uid_t);
  void	 swab(const void *, void *, size_t);
--- 423,429 ----
***************
*** 492,497 ****
--- 488,494 ----
  #if __BSD_VISIBLE
  int	 acct(const char *);
  int	 closefrom(int);
+ int	 crypt_checkpass(const char *, const char *);
  int	 des_cipher(const char *, char *, int32_t, int);
  int	 des_setkey(const char *);
  void	 endusershell(void);
***************
*** 538,543 ****
--- 535,541 ----
  int	 sethostname(const char *, size_t);
  int	 setlogin(const char *);
  void	*setmode(const char *);
+ int	 setpgrp(pid_t _pid, pid_t _pgrp);	/* BSD compat version */
  int	 setresgid(gid_t, gid_t, gid_t);
  int	 setresuid(uid_t, uid_t, uid_t);
  void	 setusershell(void);