OSDN Git Service

2008-07-05 Paolo Carlini <paolo.carlini@oracle.com>
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Sat, 5 Jul 2008 12:36:03 +0000 (12:36 +0000)
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Sat, 5 Jul 2008 12:36:03 +0000 (12:36 +0000)
* include/bits/postypes.h: Do not include <stdint.h>.

* include/Makefile.am: Reorder.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137505 138bc75d-0d04-0410-961f-82ee72b054a4

libstdc++-v3/ChangeLog
libstdc++-v3/include/Makefile.am
libstdc++-v3/include/bits/postypes.h

index 55b9389..c12e50c 100644 (file)
@@ -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>
index 7e82b80..89ac735 100644 (file)
@@ -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 \
index 2870a8e..5ead488 100644 (file)
 
 #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