Use fseek/ftell instead of fseeko/ftello when Newlib is the libc

[jroelofs]

Summary

... because fseeko and ftello are under STRICT_ANSI, and off_t is long (so they're the same anyway).

[jfb]

include/fstream

810

#if defined(_WIN32) || defined(_NEWLIB_VERSION)

829

Ditto.

894

Ditto.

include/iosfwd

184

Where does this come from?

[jroelofs]

include/iosfwd

184

<__config>

[jroelofs]

Fix defined(_WIN32)'s, and this time with more context.

[jfb]

include/iosfwd

184

I meant: add a comment to the code so people reading it know why long int is used.

[jroelofs]

Add comment explaining why streamoff should be 'long int' for newlib.

[jfb]

lgtm, will let Marshall comment.

[jroelofs]

Any opinion on this, @mclow.lists?

[jroelofs]

@mclow.lists: ping

[jroelofs]

ping

[mclow.lists]

LGTM.

[jroelofs]

Committed r227804. Thanks @mclow.lists!

include/fstream

case ios_base::cur:
         __whence = SEEK_CUR;
         break;
     case ios_base::end:
         __whence = SEEK_END;
         break;
     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_);
 #else
     if (fseeko(__file_, __width > 0 ? __width * __off : 0, __whence))
         return pos_type(off_type(-1));
     pos_type __r = ftello(__file_);
 #endif
     __r.state(__st_);
     return __r;
 }
 
 template <class _CharT, class _Traits>
 typename basic_filebuf<_CharT, _Traits>::pos_type
 basic_filebuf<_CharT, _Traits>::seekpos(pos_type __sp, ios_base::openmode)
 {
     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
     if (fseeko(__file_, __sp, SEEK_SET))
         return pos_type(off_type(-1));
 #endif
     __st_ = __sp.state();
     return __sp;
else if (__cm_ & ios_base::in)
                     const int __off =  __cv_->length(__state, __extbuf_,
                                                      __extbufnext_,
                                                      this->gptr() - this->eback());
                     __c += __extbufnext_ - __extbuf_ - __off;
                     __update_st = true;
                 }
             }
         }
-#if _WIN32
+#if defined(_WIN32) || defined(_NEWLIB_VERSION)
         if (fseek(__file_, -__c, SEEK_CUR))
             return -1;
 #else
         if (fseeko(__file_, -__c, SEEK_CUR))
             return -1;
 #endif
         if (__update_st)
             __st_ = __state;

include/iosfwd

 template <class _State>             class _LIBCPP_TYPE_VIS_ONLY fpos;
 typedef fpos<mbstate_t>    streampos;
 typedef fpos<mbstate_t>    wstreampos;
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
 typedef fpos<mbstate_t>    u16streampos;
 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>,
           class _Allocator = allocator<_CharT> >
     class _LIBCPP_TYPE_VIS_ONLY basic_string;
 typedef basic_string<char, char_traits<char>, allocator<char> > string;
 typedef basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t> > wstring;
 
 _LIBCPP_END_NAMESPACE_STD
 
 #endif  // _LIBCPP_IOSFWD