From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 15 Aug 2007 11:07:13 +0000 (+0000)
Subject: added wxConvertTo/FromIeeeExtended() synonyms for ConvertTo/FromIeeeExtended() and... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/225dfbc51713da154f0bdc03f3ce06b9cba97970

added wxConvertTo/FromIeeeExtended() synonyms for ConvertTo/FromIeeeExtended() and deprecated the latters; also added missing dll export declarations for them (patch 1772233)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/math.h b/include/wx/math.h
index 9d03f185d1..b398fcc243 100644
--- a/include/wx/math.h
+++ b/include/wx/math.h
@@ -132,8 +132,15 @@
     extern "C" {
 #endif
     /* functions from common/extended.c */
-    extern wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes);
-    extern void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes);
+    WXDLLEXPORT wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes);
+    WXDLLEXPORT void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes);
+
+    /* use wxConvertFromIeeeExtended() and wxConvertToIeeeExtended() instead */
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED( WXDLLEXPORT wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes) );
+    wxDEPRECATED( WXDLLEXPORT void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes) );
+#endif // WXWIN_COMPATIBILITY_2_8
+
 #ifdef __cplusplus
     }
 #endif
diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index 99e9051c03..40e10fe09c 100644
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -92,7 +92,7 @@ double wxDataInputStream::ReadDouble()
   char buf[10];
 
   m_input->Read(buf, 10);
-  return ConvertFromIeeeExtended((const wxInt8 *)buf);
+  return wxConvertFromIeeeExtended((const wxInt8 *)buf);
 #else
   return 0.0;
 #endif
@@ -529,7 +529,7 @@ void wxDataOutputStream::WriteDouble(double d)
   char buf[10];
 
 #if wxUSE_APPLE_IEEE
-  ConvertToIeeeExtended(d, (wxInt8 *)buf);
+  wxConvertToIeeeExtended(d, (wxInt8 *)buf);
 #else
 #if !defined(__VMS__) && !defined(__GNUG__)
 # pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
diff --git a/src/common/extended.c b/src/common/extended.c
index 53cf1db8b5..6933fb2ac9 100644
--- a/src/common/extended.c
+++ b/src/common/extended.c
@@ -105,7 +105,7 @@
  * and a 64-bit mantissa, with no hidden bit.
  ****************************************************************/
 
-wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes)
+WXDLLEXPORT wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes)
 {
     wxFloat64 f;
     wxInt32 expon;
@@ -145,7 +145,7 @@ wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes)
 /****************************************************************/
 
 
-void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
+WXDLLEXPORT void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
 {
     wxInt32 sign;
     wxInt32 expon;
@@ -191,6 +191,16 @@ void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
     bytes[9] = loMant;
 }
 
+#if WXWIN_COMPATIBILITY_2_8
+WXDLLEXPORT wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes)
+{
+    return wxConvertFromIeeeExtended(bytes);
+}
 
+WXDLLEXPORT void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
+{
+    wxConvertToIeeeExtended(num, bytes);
+}
+#endif // WXWIN_COMPATIBILITY_2_8
 
 #endif /* wxUSE_APPLE_IEEE */