===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/limits.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/include/limits.h	2004/06/09 17:32:10	1.11
--- src/include/limits.h	2005/12/13 00:35:22	1.12
***************
*** 1,4 ****
! /*	$OpenBSD: limits.h,v 1.11 2004/06/09 17:32:10 millert Exp $	*/
  /*	$NetBSD: limits.h,v 1.7 1994/10/26 00:56:00 cgd Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: limits.h,v 1.12 2005/12/13 00:35:22 millert Exp $	*/
  /*	$NetBSD: limits.h,v 1.7 1994/10/26 00:56:00 cgd Exp $	*/
  
  /*
***************
*** 35,41 ****
  #ifndef _LIMITS_H_
  #define	_LIMITS_H_
  
! #if !defined(_ANSI_SOURCE)
  #define	_POSIX_ARG_MAX		4096
  #define	_POSIX_CHILD_MAX	25
  #define	_POSIX_LINK_MAX		8
--- 35,43 ----
  #ifndef _LIMITS_H_
  #define	_LIMITS_H_
  
! #include <sys/cdefs.h>
! 
! #if __POSIX_VISIBLE
  #define	_POSIX_ARG_MAX		4096
  #define	_POSIX_CHILD_MAX	25
  #define	_POSIX_LINK_MAX		8
***************
*** 62,74 ****
  #define	_POSIX2_LINE_MAX	2048
  #define	_POSIX2_RE_DUP_MAX	_POSIX_RE_DUP_MAX
  
! /* P1003.1c */
  #define _POSIX_TTY_NAME_MAX	260
  #define _POSIX_LOGIN_NAME_MAX	MAXLOGNAME
  
! #if !defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE)
! #define PASS_MAX		128
  
  #define NL_ARGMAX		9
  #define NL_LANGMAX		14
  #define NL_MSGMAX		32767
--- 64,81 ----
  #define	_POSIX2_LINE_MAX	2048
  #define	_POSIX2_RE_DUP_MAX	_POSIX_RE_DUP_MAX
  
! #if __POSIX_VISIBLE >= 200112
  #define _POSIX_TTY_NAME_MAX	260
  #define _POSIX_LOGIN_NAME_MAX	MAXLOGNAME
  
! #define TTY_NAME_MAX		_POSIX_TTY_NAME_MAX
! #define LOGIN_NAME_MAX		MAXLOGNAME
! #endif
! #endif /* __POSIX_VISIBLE */
  
+ #if __XPG_VISIBLE
+ #define PASS_MAX		128	/* _PASSWORD_LEN from <pwd.h> */
+ 
  #define NL_ARGMAX		9
  #define NL_LANGMAX		14
  #define NL_MSGMAX		32767
***************
*** 77,91 ****
  #define NL_TEXTMAX		255
  
  #define TMP_MAX                 308915776
! #endif /* !_POSIX_C_SOURCE || _XOPEN_SOURCE */
  
- #endif /* !_ANSI_SOURCE */
- 
- /* where does this belong? it is defined by P1003.1c */
- #define TTY_NAME_MAX		_POSIX_TTY_NAME_MAX
- #define LOGIN_NAME_MAX		MAXLOGNAME
- 
  #include <sys/limits.h>
  #include <sys/syslimits.h>
  
  #endif /* !_LIMITS_H_ */
--- 84,95 ----
  #define NL_TEXTMAX		255
  
  #define TMP_MAX                 308915776
! #endif /* __XPG_VISIBLE */
  
  #include <sys/limits.h>
+ 
+ #if __POSIX_VISIBLE
  #include <sys/syslimits.h>
+ #endif
  
  #endif /* !_LIMITS_H_ */