svn commit: r219271 - in head: include sys/sys

[Jilles Tjoelker]

Author: jilles
Date: Fri Mar  4 19:28:27 2011
New Revision: 219271
URL: http://svn.freebsd.org/changeset/base/219271

Log:
  POSIX.1-2008 moved some constants from the XSI option to the Base.
  
  MFC after:	2 weeks

Modified:
  head/include/limits.h
  head/sys/sys/limits.h

Modified: head/include/limits.h
==============================================================================
--- head/include/limits.h	Fri Mar  4 18:46:19 2011	(r219270)
+++ head/include/limits.h	Fri Mar  4 19:28:27 2011	(r219271)
@@ -116,18 +116,21 @@
 #define	_POSIX_RE_DUP_MAX	_POSIX2_RE_DUP_MAX
 #endif
 
+#if __XSI_VISIBLE || __POSIX_VISIBLE >= 200809
+#define	NL_ARGMAX		99	/* max # of position args for printf */
+#define	NL_MSGMAX		32767
+#define	NL_SETMAX		255
+#define	NL_TEXTMAX		2048
+#endif
+
 #if __XSI_VISIBLE
 #define	_XOPEN_IOV_MAX		16
 #define	_XOPEN_NAME_MAX		255
 #define	_XOPEN_PATH_MAX		1024
 #define	PASS_MAX		128	/* _PASSWORD_LEN from <pwd.h> */
 
-#define	NL_ARGMAX		99	/* max # of position args for printf */
 #define	NL_LANGMAX		31	/* max LANG name length */
-#define	NL_MSGMAX		32767
 #define	NL_NMAX			1
-#define	NL_SETMAX		255
-#define	NL_TEXTMAX		2048
 #endif
 
 #define	MB_LEN_MAX		6	/* 31-bit UTF-8 */

Modified: head/sys/sys/limits.h
==============================================================================
--- head/sys/sys/limits.h	Fri Mar  4 18:46:19 2011	(r219270)
+++ head/sys/sys/limits.h	Fri Mar  4 19:28:27 2011	(r219271)
@@ -88,7 +88,7 @@
 #define	QUAD_MIN	(__QUAD_MIN)	/* min value for a quad_t */
 #endif
 
-#if __XSI_VISIBLE
+#if __XSI_VISIBLE || __POSIX_VISIBLE >= 200809
 #define	LONG_BIT	__LONG_BIT
 #define	WORD_BIT	__WORD_BIT
 #endif