X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d870a03054ca05996857068c78f01b68fcf7b2a0..12b5f4b4d2d8a07962da7ba3b78c8c1ec2634a67:/src/common/longlong.cpp

diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp
index 772ecc0b9a..85591bb67c 100644
--- a/src/common/longlong.cpp
+++ b/src/common/longlong.cpp
@@ -33,11 +33,7 @@
     #include "wx/txtstrm.h"
 #endif
 
-#if defined(__MWERKS__) && defined(__WXMSW__)
-    #include <string.h>     // for memset()
-#else
-    #include <memory.h>     // for memset()
-#endif
+#include <string.h>            // for memset()
 
 #include "wx/ioswrap.h"
 
@@ -1267,7 +1263,7 @@ WXDLLIMPEXP_BASE wxTextOutputStream& operator<< (wxTextOutputStream& o, const wx
     return o << ll.ToString();
 }
 
-#define READ_STRING_CHAR(s, idx, len) ((wxChar) ((idx!=len) ? s[idx++] : 0))
+#define READ_STRING_CHAR(s, idx, len) ((idx!=len) ? (wxChar)s[idx++] : _T('\0'))
 
 WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxULongLong &ll)
 {