reverted the fix for Unicode compilation with VC++ as it breaks other ports (and...

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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 8b97f59337961040e0657082aa748dd4f633697b..5f5ae4b89fabbe28aadd283b5a6fa2f8b8de9b24 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -37,6 +37,25 @@
 #include <string.h>
 #include <stdlib.h>
 
 #include <string.h>
 #include <stdlib.h>
 

+
+#include "wx/debug.h"
+#include "wx/strconv.h"
+#include "wx/intl.h"
+#include "wx/log.h"
+
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+
+WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
+
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+#if wxUSE_WCHAR_T
+

 #ifdef __SALFORDC__
   #include <clib.h>
 #endif
 #ifdef __SALFORDC__
   #include <clib.h>
 #endif


@@ -49,12 +68,6 @@
   #include <windows.h>
 #endif
 
   #include <windows.h>
 #endif
 

-#include "wx/debug.h"
-#include "wx/strconv.h"
-#include "wx/intl.h"
-#include "wx/log.h"
-
-#if wxUSE_WCHAR_T

 #define BSWAP_UCS4(str, len) { unsigned _c; for (_c=0; _c<len; _c++) str[_c]=wxUINT32_SWAP_ALWAYS(str[_c]); }
 #define BSWAP_UTF16(str, len) { unsigned _c; for (_c=0; _c<len; _c++) str[_c]=wxUINT16_SWAP_ALWAYS(str[_c]); }
 
 #define BSWAP_UCS4(str, len) { unsigned _c; for (_c=0; _c<len; _c++) str[_c]=wxUINT32_SWAP_ALWAYS(str[_c]); }
 #define BSWAP_UTF16(str, len) { unsigned _c; for (_c=0; _c<len; _c++) str[_c]=wxUINT16_SWAP_ALWAYS(str[_c]); }
 


@@ -86,15 +99,6 @@
     #error "Weird sizeof(wchar_t): please report your platform details to wx-users mailing list"
 #endif
 
     #error "Weird sizeof(wchar_t): please report your platform details to wx-users mailing list"
 #endif
 

-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
-
-WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
-
-// ============================================================================
-// implementation
-// ============================================================================

 
 #ifdef WC_UTF16
 
 
 #ifdef WC_UTF16
 


@@ -637,7 +641,7 @@ public:
         size_t outbuf = n;
         size_t res, cres;
         
         size_t outbuf = n;
         size_t res, cres;
         

-        wchar_t *tmpbuf;
+        wchar_t *tmpbuf = 0;

 
         if (g_wcNeedsSwap)
         {
 
         if (g_wcNeedsSwap)
         {


@@ -969,7 +973,6 @@ public:
 // ----------------------------------------------------------------------------
 
 WXDLLEXPORT_DATA(wxMBConv) wxConvLibc, wxConvFile;
 // ----------------------------------------------------------------------------
 
 WXDLLEXPORT_DATA(wxMBConv) wxConvLibc, wxConvFile;

-WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;

 
 #endif // wxUSE_WCHAR_T
 
 
 #endif // wxUSE_WCHAR_T