Merge sunshine-internal -> sunshine-experimental

2012-09-20 04:57:04 +00:00 · 2012-09-20 04:57:04 +00:00 · 588dc32ae4
parent f4ae8f1c4d 7d62343f44
commit 588dc32ae4
1 changed files with 4 additions and 0 deletions
--- a/indra/llcommon/llfile.cpp
+++ b/indra/llcommon/llfile.cpp
@ -411,6 +411,9 @@ LLFILE *	LLFile::_Fiopen(const std::string& filename,
 //#endif
 //}

+
+// *TODO: Seek the underlying c stream for better cross-platform compatibility?
+#if !LL_WINDOWS
 llstdio_filebuf::int_type llstdio_filebuf::overflow(llstdio_filebuf::int_type __c)
 {
 	int_type __ret = traits_type::eof();
@ -829,6 +832,7 @@ int llstdio_filebuf::sync()
 {
 	return (_M_file.sync() == 0 ? 0 : -1);
 }
+#endif

 /************** input file stream ********************************/