diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2008-07-05 12:36:03 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2008-07-05 12:36:03 +0000 |
| commit | b49aadf8b6efc45f81f42bf39ede057dd8874bf8 (patch) | |
| tree | a2310ccc59f7df879a40d41199af9d101493033a | |
| parent | ea31932d5340a2c7d3c3e54ddc3b7b7bb45b8b3e (diff) | |
| download | gcc-b49aadf8b6efc45f81f42bf39ede057dd8874bf8.zip gcc-b49aadf8b6efc45f81f42bf39ede057dd8874bf8.tar.gz gcc-b49aadf8b6efc45f81f42bf39ede057dd8874bf8.tar.bz2 | |
postypes.h: Do not include <stdint.h>.
2008-07-05 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/postypes.h: Do not include <stdint.h>.
* include/Makefile.am: Reorder.
From-SVN: r137505
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.am | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/postypes.h | 10 |
3 files changed, 12 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 55b9389..c12e50c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 2008-07-05 Paolo Carlini <paolo.carlini@oracle.com> + * include/bits/postypes.h: Do not include <stdint.h>. + + * include/Makefile.am: Reorder. + +2008-07-05 Paolo Carlini <paolo.carlini@oracle.com> + * include/std/ratio: Prefer __INTMAX_MAX__ to INTMAX_MAX (INTMAX_MIN). 2008-07-05 Chris Fairles <chris.fairles@gmail.com> diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 7e82b80..89ac735 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -54,8 +54,8 @@ std_headers = \ ${std_srcdir}/ostream \ ${std_srcdir}/queue \ ${std_srcdir}/random \ - ${std_srcdir}/regex \ ${std_srcdir}/ratio \ + ${std_srcdir}/regex \ ${std_srcdir}/set \ ${std_srcdir}/sstream \ ${std_srcdir}/stack \ diff --git a/libstdc++-v3/include/bits/postypes.h b/libstdc++-v3/include/bits/postypes.h index 2870a8e..5ead488 100644 --- a/libstdc++-v3/include/bits/postypes.h +++ b/libstdc++-v3/include/bits/postypes.h @@ -46,10 +46,6 @@ #include <cwchar> // For mbstate_t -#ifdef _GLIBCXX_HAVE_STDINT_H -#include <stdint.h> // For int64_t -#endif - _GLIBCXX_BEGIN_NAMESPACE(std) // The types streamoff, streampos and wstreampos and the class @@ -68,7 +64,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * was typedef long. */ #ifdef _GLIBCXX_HAVE_INT64_T - typedef int64_t streamoff; +# if (__CHAR_BIT__ * __SIZEOF_LONG__ == 64) + typedef long streamoff; +# else + typedef long long streamoff; +# endif #else typedef long long streamoff; #endif |