From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Sat, 5 Jul 2008 12:36:03 +0000 (+0000)
Subject: postypes.h: Do not include <stdint.h>.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b49aadf8b6efc45f81f42bf39ede057dd8874bf8;p=gcc.git

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 55b93899b0d..c12e50cc9f6 100644
--- 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 7e82b8034b4..89ac735b218 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 2870a8e59a1..5ead488fa48 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