Module Name: src
Committed By: joerg
Date: Mon Apr 22 21:26:48 UTC 2013
Modified Files:
src/sys/sys: inttypes.h stdint.h
Log Message:
C++11 no longer requires __STDC_LIMIT_MACROS, __STDC_CONSTANT_MACROS or
__STDC_FORMAT_MACROS to be set for the C headers to work.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/sys/inttypes.h
cvs rdiff -u -r1.6 -r1.7 src/sys/sys/stdint.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/inttypes.h
diff -u src/sys/sys/inttypes.h:1.5 src/sys/sys/inttypes.h:1.6
--- src/sys/sys/inttypes.h:1.5 Mon Apr 28 20:24:10 2008
+++ src/sys/sys/inttypes.h Mon Apr 22 21:26:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: inttypes.h,v 1.5 2008/04/28 20:24:10 martin Exp $ */
+/* $NetBSD: inttypes.h,v 1.6 2013/04/22 21:26:48 joerg Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -38,7 +38,8 @@
#include <sys/stdint.h>
-#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS)
+#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) || \
+ (__cplusplus >= 201103L)
#include <machine/int_fmtio.h>
#endif
Index: src/sys/sys/stdint.h
diff -u src/sys/sys/stdint.h:1.6 src/sys/sys/stdint.h:1.7
--- src/sys/sys/stdint.h:1.6 Mon Apr 28 20:24:11 2008
+++ src/sys/sys/stdint.h Mon Apr 22 21:26:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: stdint.h,v 1.6 2008/04/28 20:24:11 martin Exp $ */
+/* $NetBSD: stdint.h,v 1.7 2013/04/22 21:26:48 joerg Exp $ */
/*-
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -87,11 +87,13 @@ typedef __uintptr_t uintptr_t;
#include <machine/int_mwgwtypes.h>
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) || \
+ (__cplusplus >= 201103L)
#include <machine/int_limits.h>
#endif
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) || \
+ (__cplusplus >= 201103L)
#include <machine/int_const.h>
#endif
