wxString::FormatV() fix (bug 416853)

[wxWidgets.git] / src / common / strconv.cpp

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index ab68a01e14520725a5a03974b9f880dff2876e7a..69f9a7a85a497ab12979ea12b967a0dd3574cee9 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -48,10 +48,14 @@
   #include <langinfo.h>
 #endif
 
+#ifdef __WXMSW__
+  #include <windows.h>
+#endif
+
 #include "wx/debug.h"
 #include "wx/strconv.h"
 
-#ifdef WORDS_BIGENDIAN
+#if defined(WORDS_BIGENDIAN) || defined(__STDC_ISO_10646__)
 #define BSWAP_UCS4(str, len)
 #define BSWAP_UCS2(str, len)
 #else
@@ -83,6 +87,8 @@ WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
 
 #if wxUSE_WCHAR_T
 
+#ifdef WC_UTF16
+
 static size_t encode_utf16(wxUint32 input,wxUint16*output)
 {
   if (input<=0xffff) {
@@ -115,6 +121,8 @@ static size_t decode_utf16(wxUint16*input,wxUint32&output)
   }
 }
 
+#endif // WC_UTF16
+
 // ----------------------------------------------------------------------------
 // wxMBConv
 // ----------------------------------------------------------------------------