fix the output length returned from cWC2MB/MB2WC() to be consistent with From/ToWChar...

[wxWidgets.git] / include / wx / math.h

diff --git a/include/wx/math.h b/include/wx/math.h
index b398fcc24313e2847e665bff46a2495ade0bdcd3..b7096cbfdb04152e94e458defb5dd717758f6ce4 100644 (file)
--- a/include/wx/math.h
+++ b/include/wx/math.h
@@ -60,6 +60,9 @@
 #elif defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
       defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
       defined(__HPUX__)||defined(__MWERKS__)
 #elif defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
       defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
       defined(__HPUX__)||defined(__MWERKS__)

+#ifdef __SOLARIS__
+#include <ieeefp.h>
+#endif

     #define wxFinite(x) finite(x)
 #else
     #define wxFinite(x) ((x) == (x))
     #define wxFinite(x) finite(x)
 #else
     #define wxFinite(x) ((x) == (x))


@@ -132,13 +135,13 @@
     extern "C" {
 #endif
     /* functions from common/extended.c */
     extern "C" {
 #endif
     /* functions from common/extended.c */

-    WXDLLEXPORT wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes);
-    WXDLLEXPORT void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes);
+    WXDLLIMPEXP_BASE wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes);
+    WXDLLIMPEXP_BASE void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes);

 
     /* use wxConvertFromIeeeExtended() and wxConvertToIeeeExtended() instead */
 #if WXWIN_COMPATIBILITY_2_8
 
     /* 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) );
+    wxDEPRECATED( WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes) );
+    wxDEPRECATED( WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes) );

 #endif // WXWIN_COMPATIBILITY_2_8
 
 #ifdef __cplusplus
 #endif // WXWIN_COMPATIBILITY_2_8
 
 #ifdef __cplusplus