From owner-svn-src-all@FreeBSD.ORG  Wed Mar 31 02:12:24 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B5746106566B;
	Wed, 31 Mar 2010 02:12:24 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A4B1B8FC1F;
	Wed, 31 Mar 2010 02:12:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2V2COOm063421;
	Wed, 31 Mar 2010 02:12:24 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2V2CO7b063419;
	Wed, 31 Mar 2010 02:12:24 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003310212.o2V2CO7b063419@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Wed, 31 Mar 2010 02:12:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205954 - head/include
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Mar 2010 02:12:24 -0000

Author: jmallett
Date: Wed Mar 31 02:12:24 2010
New Revision: 205954
URL: http://svn.freebsd.org/changeset/base/205954

Log:
  Be like stdlib.h and bring in a wchar_t definition and use it to prototype
  wcstoimax and wcstoumax, rather than spelling it __wchar_t.  This is necessary
  to use these functions in C++ where wchar_t is different to __wchar_t and is
  a built-in type.
  
  It may be better to use __wchar_t here and to simply define __wchar_t as being
  wchar_t in C++ mode rather than to bring in wchar_t, but this is less invasive
  and follows our existing practice, and restores wchar_t usage in this file to
  what it was before r1.8.

Modified:
  head/include/inttypes.h

Modified: head/include/inttypes.h
==============================================================================
--- head/include/inttypes.h	Wed Mar 31 01:51:08 2010	(r205953)
+++ head/include/inttypes.h	Wed Mar 31 02:12:24 2010	(r205954)
@@ -32,6 +32,13 @@
 #include <machine/_inttypes.h>
 #include <sys/stdint.h>
 
+#ifndef	__cplusplus
+#ifndef _WCHAR_T_DECLARED
+typedef	__wchar_t	wchar_t;
+#define	_WCHAR_T_DECLARED
+#endif
+#endif
+
 typedef struct {
 	intmax_t	quot;		/* Quotient. */
 	intmax_t	rem;		/* Remainder. */
@@ -43,10 +50,10 @@ imaxdiv_t	imaxdiv(intmax_t, intmax_t) __
 
 intmax_t	strtoimax(const char * __restrict, char ** __restrict, int);
 uintmax_t	strtoumax(const char * __restrict, char ** __restrict, int);
-intmax_t	wcstoimax(const __wchar_t * __restrict,
-		    __wchar_t ** __restrict, int);
-uintmax_t	wcstoumax(const __wchar_t * __restrict,
-		    __wchar_t ** __restrict, int);
+intmax_t	wcstoimax(const wchar_t * __restrict,
+		    wchar_t ** __restrict, int);
+uintmax_t	wcstoumax(const wchar_t * __restrict,
+		    wchar_t ** __restrict, int);
 __END_DECLS
 
 #endif /* !_INTTYPES_H_ */