From owner-svn-src-head@FreeBSD.ORG  Sun Mar  4 20:02:21 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0493D106564A;
	Sun,  4 Mar 2012 20:02:21 +0000 (UTC)
	(envelope-from tijl@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E40DA8FC16;
	Sun,  4 Mar 2012 20:02:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q24K2KJF050462;
	Sun, 4 Mar 2012 20:02:20 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q24K2KWF050460;
	Sun, 4 Mar 2012 20:02:20 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201203042002.q24K2KWF050460@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Sun, 4 Mar 2012 20:02:20 +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: r232519 - head/sys/x86/include
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sun, 04 Mar 2012 20:02:21 -0000

Author: tijl
Date: Sun Mar  4 20:02:20 2012
New Revision: 232519
URL: http://svn.freebsd.org/changeset/base/232519

Log:
  Do not use INT64_C and UINT64_C to define 64 bit integer limits.  They
  aren't defined for C++ code unless __STDC_CONSTANT_MACROS is defined.
  
  Reported by:	jhb

Modified:
  head/sys/x86/include/_stdint.h

Modified: head/sys/x86/include/_stdint.h
==============================================================================
--- head/sys/x86/include/_stdint.h	Sun Mar  4 19:22:52 2012	(r232518)
+++ head/sys/x86/include/_stdint.h	Sun Mar  4 20:02:20 2012	(r232519)
@@ -69,23 +69,27 @@
  * ISO/IEC 9899:1999
  * 7.18.2.1 Limits of exact-width integer types
  */
-/* Minimum values of exact-width signed integer types. */
 #define	INT8_MIN	(-0x7f-1)
 #define	INT16_MIN	(-0x7fff-1)
 #define	INT32_MIN	(-0x7fffffff-1)
-#define	INT64_MIN	(-INT64_C(0x7fffffffffffffff)-1)
 
-/* Maximum values of exact-width signed integer types. */
 #define	INT8_MAX	0x7f
 #define	INT16_MAX	0x7fff
 #define	INT32_MAX	0x7fffffff
-#define	INT64_MAX	INT64_C(0x7fffffffffffffff)
 
-/* Maximum values of exact-width unsigned integer types. */
 #define	UINT8_MAX	0xff
 #define	UINT16_MAX	0xffff
 #define	UINT32_MAX	0xffffffffU
-#define	UINT64_MAX	UINT64_C(0xffffffffffffffff)
+
+#ifdef _LP64
+#define	INT64_MIN	(-0x7fffffffffffffff-1)
+#define	INT64_MAX	0x7fffffffffffffff
+#define	UINT64_MAX	0xffffffffffffffff
+#else
+#define	INT64_MIN	(-0x7fffffffffffffffLL-1)
+#define	INT64_MAX	0x7fffffffffffffffLL
+#define	UINT64_MAX	0xffffffffffffffffULL
+#endif
 
 /*
  * ISO/IEC 9899:1999