diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2006-07-24 12:30:28 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2006-07-24 12:30:28 +0000 |
| commit | a0cbafebd7272e3a556f5737d19bbac555c2de44 (patch) | |
| tree | eb40ed18567a9ad765576edc610a1ca89083dce0 | |
| parent | 63c2d00ca70c962e229d8353772f53b49c20680f (diff) | |
| download | gcc-a0cbafebd7272e3a556f5737d19bbac555c2de44.zip gcc-a0cbafebd7272e3a556f5737d19bbac555c2de44.tar.gz gcc-a0cbafebd7272e3a556f5737d19bbac555c2de44.tar.bz2 | |
cinttypes: Simply protect everything with _GLIBCXX_USE_C99_INTTYPES_TR1.
2006-07-24 Paolo Carlini <pcarlini@suse.de>
* include/tr1/cinttypes: Simply protect everything with
_GLIBCXX_USE_C99_INTTYPES_TR1.
* include/tr1/cfenv: Likewise with _GLIBCXX_USE_C99_FENV_TR1.
* include/tr1/cstdint: Likewise with _GLIBCXX_USE_C99_STDINT_TR1.
From-SVN: r115715
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/cfenv | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/cinttypes | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/cstdint | 6 |
4 files changed, 13 insertions, 13 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 155bb86..e5c4057 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2006-07-24 Paolo Carlini <pcarlini@suse.de> + + * include/tr1/cinttypes: Simply protect everything with + _GLIBCXX_USE_C99_INTTYPES_TR1. + * include/tr1/cfenv: Likewise with _GLIBCXX_USE_C99_FENV_TR1. + * include/tr1/cstdint: Likewise with _GLIBCXX_USE_C99_STDINT_TR1. + 2006-07-21 Benjamin Kosnik <bkoz@redhat.com> * include/tr1/random: Make include guards consistent. diff --git a/libstdc++-v3/include/tr1/cfenv b/libstdc++-v3/include/tr1/cfenv index d4e925a..93f6d43 100644 --- a/libstdc++-v3/include/tr1/cfenv +++ b/libstdc++-v3/include/tr1/cfenv @@ -36,12 +36,10 @@ #include <bits/c++config.h> -#if _GLIBCXX_HAVE_FENV_H -#include <fenv.h> -#endif - #if _GLIBCXX_USE_C99_FENV_TR1 +#include <fenv.h> + #undef feclearexcept #undef fegetexceptflag #undef feraiseexcept diff --git a/libstdc++-v3/include/tr1/cinttypes b/libstdc++-v3/include/tr1/cinttypes index 25e5c07..5a899fe 100644 --- a/libstdc++-v3/include/tr1/cinttypes +++ b/libstdc++-v3/include/tr1/cinttypes @@ -35,16 +35,13 @@ #define _TR1_CINTTYPES 1 #include <bits/c++config.h> - #include <tr1/cstdint> -#if _GLIBCXX_HAVE_INTTYPES_H +#if _GLIBCXX_USE_C99_INTTYPES_TR1 + // For 8.11.1/1 (see C99, Note 184) #define __STDC_FORMAT_MACROS #include <inttypes.h> -#endif - -#if _GLIBCXX_USE_C99_INTTYPES_TR1 // namespace std::tr1 namespace std diff --git a/libstdc++-v3/include/tr1/cstdint b/libstdc++-v3/include/tr1/cstdint index 37a1550..198d746 100644 --- a/libstdc++-v3/include/tr1/cstdint +++ b/libstdc++-v3/include/tr1/cstdint @@ -36,14 +36,12 @@ #include <bits/c++config.h> -#if _GLIBCXX_HAVE_STDINT_H +#if _GLIBCXX_USE_C99_STDINT_TR1 + // For 8.22.1/1 (see C99, Notes 219, 220, 222) #define __STDC_LIMIT_MACROS #define __STDC_CONSTANT_MACROS #include <stdint.h> -#endif - -#if _GLIBCXX_USE_C99_STDINT_TR1 // namespace std::tr1 namespace std |