Revert: Revert r227804: Use fseek/ftell instead of fseeko/ftello when Newlib is the libc
EricWF has updated the compilers on his buildbots. Hopefully they won't crash now.
llvm-svn: 227971
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 07d9d76a2d79e080f7cd022755c4f963d71cc529
diff --git a/include/fstream b/include/fstream
index 38778c6..ace5eb9 100644
--- a/include/fstream
+++ b/include/fstream
@@ -807,7 +807,7 @@
default:
return pos_type(off_type(-1));
}
-#if _WIN32
+#if defined(_WIN32) || defined(_NEWLIB_VERSION)
if (fseek(__file_, __width > 0 ? __width * __off : 0, __whence))
return pos_type(off_type(-1));
pos_type __r = ftell(__file_);
@@ -826,7 +826,7 @@
{
if (__file_ == 0 || sync())
return pos_type(off_type(-1));
-#if _WIN32
+#if defined(_WIN32) || defined(_NEWLIB_VERSION)
if (fseek(__file_, __sp, SEEK_SET))
return pos_type(off_type(-1));
#else
@@ -891,7 +891,7 @@
}
}
}
-#if _WIN32
+#if defined(_WIN32) || defined(_NEWLIB_VERSION)
if (fseek(__file_, -__c, SEEK_CUR))
return -1;
#else
diff --git a/include/iosfwd b/include/iosfwd
index d24c227..eccfd34 100644
--- a/include/iosfwd
+++ b/include/iosfwd
@@ -180,7 +180,12 @@
typedef fpos<mbstate_t> u32streampos;
#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#if defined(_NEWLIB_VERSION)
+// On newlib, off_t is 'long int'
+typedef long int streamoff; // for char_traits in <string>
+#else
typedef long long streamoff; // for char_traits in <string>
+#endif
template <class _CharT, // for <stdexcept>
class _Traits = char_traits<_CharT>,