fix wxMBConv_iconv to respect the base class conventions: when the input is NUL-termi...

[wxWidgets.git] / src / common / extended.c

diff --git a/src/common/extended.c b/src/common/extended.c
index 9ff1b19f022d27e6c4a8a1da2c618dceddd21a79..6844663420abaed0576ed8d7a0db7947b881ec9f 100644 (file)
--- a/src/common/extended.c
+++ b/src/common/extended.c
@@ -9,7 +9,7 @@
 
 
 #if defined(_WIN32_WCE)
 
 
 #if defined(_WIN32_WCE)

-    // eVC cause warnings in its own headers: stdlib.h and winnt.h
+    /* eVC cause warnings in its own headers: stdlib.h and winnt.h */

     #pragma warning (disable:4115)
     #pragma warning (disable:4214)
 #endif
     #pragma warning (disable:4115)
     #pragma warning (disable:4214)
 #endif


@@ -105,7 +105,7 @@
  * and a 64-bit mantissa, with no hidden bit.
  ****************************************************************/
 
  * and a 64-bit mantissa, with no hidden bit.
  ****************************************************************/
 

-wxFloat64 ConvertFromIeeeExtended(wxInt8* bytes)
+WXDLLIMPEXP_BASE wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes)

 {
     wxFloat64 f;
     wxInt32 expon;
 {
     wxFloat64 f;
     wxInt32 expon;


@@ -145,7 +145,7 @@ wxFloat64 ConvertFromIeeeExtended(wxInt8* bytes)
 /****************************************************************/
 
 
 /****************************************************************/
 
 

-void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
+WXDLLIMPEXP_BASE void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)

 {
     wxInt32 sign;
     wxInt32 expon;
 {
     wxInt32 sign;
     wxInt32 expon;


@@ -191,6 +191,16 @@ void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
     bytes[9] = loMant;
 }
 
     bytes[9] = loMant;
 }
 

+#if WXWIN_COMPATIBILITY_2_8
+WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes)
+{
+    return wxConvertFromIeeeExtended(bytes);
+}

 
 

+WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
+{
+    wxConvertToIeeeExtended(num, bytes);
+}
+#endif // WXWIN_COMPATIBILITY_2_8

 
 #endif /* wxUSE_APPLE_IEEE */
 
 #endif /* wxUSE_APPLE_IEEE */