From owner-svn-src-head@FreeBSD.ORG  Sat May 25 16:58:13 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 476ECFB6;
 Sat, 25 May 2013 16:58:13 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1FE979E1;
 Sat, 25 May 2013 16:58:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4PGwDIv011109;
 Sat, 25 May 2013 16:58:13 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4PGwChD011107;
 Sat, 25 May 2013 16:58:12 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201305251658.r4PGwChD011107@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sat, 25 May 2013 16:58:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250985 - in head: include sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 May 2013 16:58:13 -0000

Author: ed
Date: Sat May 25 16:58:12 2013
New Revision: 250985
URL: http://svnweb.freebsd.org/changeset/base/250985

Log:
  Fix <uchar.h> in for C++11.
  
  It turns out that in C++11, char16_t and char32_t are built-in types;
  language keywords. Just fix this by putting traditional _*_T_DECLARED
  blocks around the definitions. We'll just predefine these in
  <sys/_types.h>.
  
  This also opens up the possibility to define char16_t in other header
  files, if ever needed (e.g. if we would gain a <ctype.h> for
  char16_t/char32_t).

Modified:
  head/include/uchar.h
  head/sys/sys/_types.h

Modified: head/include/uchar.h
==============================================================================
--- head/include/uchar.h	Sat May 25 15:36:15 2013	(r250984)
+++ head/include/uchar.h	Sat May 25 16:58:12 2013	(r250985)
@@ -32,6 +32,16 @@
 #include <sys/cdefs.h>
 #include <sys/_types.h>
 
+#ifndef _CHAR16_T_DECLARED
+typedef	__char16_t	char16_t;
+#define	_CHAR16_T_DECLARED
+#endif
+
+#ifndef _CHAR32_T_DECLARED
+typedef	__char32_t	char32_t;
+#define	_CHAR32_T_DECLARED
+#endif
+
 #ifndef _MBSTATE_T_DECLARED
 typedef	__mbstate_t	mbstate_t;
 #define	_MBSTATE_T_DECLARED
@@ -42,9 +52,6 @@ typedef	__size_t	size_t;
 #define	_SIZE_T_DECLARED
 #endif
 
-typedef	__char16_t	char16_t;
-typedef	__char32_t	char32_t;
-
 __BEGIN_DECLS
 size_t	c16rtomb(char * __restrict, char16_t, mbstate_t * __restrict);
 size_t	c32rtomb(char * __restrict, char32_t, mbstate_t * __restrict);

Modified: head/sys/sys/_types.h
==============================================================================
--- head/sys/sys/_types.h	Sat May 25 15:36:15 2013	(r250984)
+++ head/sys/sys/_types.h	Sat May 25 16:58:12 2013	(r250985)
@@ -94,6 +94,11 @@ typedef	__ct_rune_t	__wint_t;	/* wint_t 
 typedef	__uint_least16_t __char16_t;
 typedef	__uint_least32_t __char32_t;
 #endif
+/* In C++11, char16_t and char32_t are built-in types. */
+#if defined(__cplusplus) && __cplusplus >= 201103L
+#define	_CHAR16_T_DECLARED
+#define	_CHAR32_T_DECLARED
+#endif
 
 typedef	__uint32_t	__dev_t;	/* device number */