OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cinttypes: Restore __STDC_FORMAT_MACRO after inclusion of <inttypes.h>. 

2008-09-09  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/tr1_impl/cinttypes: Restore __STDC_FORMAT_MACRO after
	inclusion of <inttypes.h>.
	* include/tr1_impl/cstdint: Likewise for __STDC_LIMIT_MACROS and
	__STDC_CONSTANT_MACROS after <stdint.h>.
	* include/bits/postypes.h: Likewise.

From-SVN: r140174
This commit is contained in:
Paolo Carlini 2008-09-09 21:33:46 +00:00 committed by Paolo Carlini
parent e56f5f3e5a
commit 802841eb8c
4 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2008-09-09 Paolo Carlini <paolo.carlini@oracle.com>
* include/tr1_impl/cinttypes: Restore __STDC_FORMAT_MACRO after
inclusion of <inttypes.h>.
* include/tr1_impl/cstdint: Likewise for __STDC_LIMIT_MACROS and
__STDC_CONSTANT_MACROS after <stdint.h>.
* include/bits/postypes.h: Likewise.
2008-09-09 Andreas Schwab <schwab@suse.de>
* acinclude.m4 (GLIBCXX_CHECK_STANDARD_LAYOUT): Fix compile check

18
libstdc++-v3/include/bits/postypes.h
View File

@ -46,18 +46,30 @@
#include <cwchar> // For mbstate_t
// XXX If <stdint.h> is really needed, make sure to define the macros,
// in order not to break <tr1/cstdint> (and <cstdint> in C++0x).
// Reconsider all this as soon as possible...
// XXX If <stdint.h> is really needed, make sure to define the macros
// before including it, in order not to break <tr1/cstdint> (and <cstdint>
// in C++0x). Reconsider all this as soon as possible...
#if (defined(_GLIBCXX_HAVE_INT64_T) && !defined(_GLIBCXX_HAVE_INT64_T_LONG) \
&& !defined(_GLIBCXX_HAVE_INT64_T_LONG_LONG))
#ifndef __STDC_LIMIT_MACROS
# define _UNDEF__STDC_LIMIT_MACROS
# define __STDC_LIMIT_MACROS
#endif
#ifndef __STDC_CONSTANT_MACROS
# define _UNDEF__STDC_CONSTANT_MACROS
# define __STDC_CONSTANT_MACROS
#endif
#include <stdint.h> // For int64_t
#ifdef _UNDEF__STDC_LIMIT_MACROS
# undef __STDC_LIMIT_MACROS
# undef _UNDEF__STDC_LIMIT_MACROS
#endif
#ifdef _UNDEF__STDC_CONSTANT_MACROS
# undef __STDC_CONSTANT_MACROS
# undef _UNDEF__STDC_CONSTANT_MACROS
#endif
#endif
_GLIBCXX_BEGIN_NAMESPACE(std)

11
libstdc++-v3/include/tr1_impl/cinttypes
View File

@ -36,9 +36,16 @@
#if _GLIBCXX_USE_C99_INTTYPES_TR1
// For 8.11.1/1 (see C99, Note 184)
#define __STDC_FORMAT_MACROS
// For 8.11.1/1 (see C99, Note 184)
#ifndef __STDC_FORMAT_MACROS
# define _UNDEF__STDC_FORMAT_MACROS
# define __STDC_FORMAT_MACROS
#endif
#include_next <inttypes.h>
#ifdef _UNDEF__STDC_FORMAT_MACROS
# undef __STDC_FORMAT_MACROS
# undef _UNDEF__STDC_FORMAT_MACROS
#endif
namespace std
{

10
libstdc++-v3/include/tr1_impl/cstdint
View File

@ -38,12 +38,22 @@
// For 8.22.1/1 (see C99, Notes 219, 220, 222)
#ifndef __STDC_LIMIT_MACROS
# define _UNDEF__STDC_LIMIT_MACROS
# define __STDC_LIMIT_MACROS
#endif
#ifndef __STDC_CONSTANT_MACROS
# define _UNDEF__STDC_CONSTANT_MACROS
# define __STDC_CONSTANT_MACROS
#endif
#include_next <stdint.h>
#ifdef _UNDEF__STDC_LIMIT_MACROS
# undef __STDC_LIMIT_MACROS
# undef _UNDEF__STDC_LIMIT_MACROS
#endif
#ifdef _UNDEF__STDC_CONSTANT_MACROS
# undef __STDC_CONSTANT_MACROS
# undef _UNDEF__STDC_CONSTANT_MACROS
#endif
namespace std
{