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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 55b93899b0d48a4514c66d02602e0d6a0832a95d..c12e50cc9f68ed844ea5e6021c1e74f5640a1ef3 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+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).

diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index 7e82b8034b4410b16316fb22b8fd5bba78f618f6..89ac735b21839027fc899d32d21e144716f6a53a 100644 (file)
--- 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 2870a8e59a1f118a4dfacdd540fd3df33981744c..5ead488fa48fb331c5391c1701b21618d250d2df 100644 (file)
--- 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