X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..27c78e4552aaefac9a4db0d4453eff09cdfef2ad:/src/common/datstrm.cpp diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp index cc82237911..0a02f17e8f 100644 --- a/src/common/datstrm.cpp +++ b/src/common/datstrm.cpp @@ -19,6 +19,7 @@ #if wxUSE_STREAMS #include "wx/datstrm.h" +#include "wx/math.h" // --------------------------------------------------------------------------- // wxDataInputStream @@ -78,16 +79,13 @@ wxUint8 wxDataInputStream::Read8() return (wxUint8)buf; } -// Must be at global scope for VC++ 5 -extern "C" double ConvertFromIeeeExtended(const unsigned char *bytes); - double wxDataInputStream::ReadDouble() { #if wxUSE_APPLE_IEEE char buf[10]; m_input->Read(buf, 10); - return ConvertFromIeeeExtended((unsigned char *)buf); + return ConvertFromIeeeExtended((const wxInt8 *)buf); #else return 0.0; #endif @@ -321,15 +319,12 @@ void wxDataOutputStream::WriteString(const wxString& string) m_output->Write(buf, len); } -// Must be at global scope for VC++ 5 -extern "C" void ConvertToIeeeExtended(double num, unsigned char *bytes); - void wxDataOutputStream::WriteDouble(double d) { char buf[10]; #if wxUSE_APPLE_IEEE - ConvertToIeeeExtended(d, (unsigned char *)buf); + ConvertToIeeeExtended(d, (wxInt8 *)buf); #else #if !defined(__VMS__) && !defined(__GNUG__) # pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"