X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a994742ab93d8cf6033f19dd7370553efb64a0f..fa1c12bdd76acc21ddb45b90bb53b2f58aed946d:/src/common/longlong.cpp

diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp
index 824f039db2..d0cda3912d 100644
--- a/src/common/longlong.cpp
+++ b/src/common/longlong.cpp
@@ -28,7 +28,12 @@
 #if wxUSE_LONGLONG
 #include "wx/longlong.h"
 
+#if defined(__MWERKS__) && defined(__WXMSW__)
+#include <string.h>     // for memset()
+#else
 #include <memory.h>     // for memset()
+#endif
+
 #include <math.h>       // for fabs()
 
 // ============================================================================
@@ -608,12 +613,11 @@ void *wxLongLongWx::asArray(void) const
 #endif // wxUSE_LONGLONG_WX
 
 wxString
-#ifdef wxUSE_LONGLONG_NATIVE
-wxLongLongNative
+#if wxUSE_LONGLONG_NATIVE
+wxLongLongNative::ToString() const
 #else
-wxLognLongWx
+wxLongLongWx::ToString() const
 #endif
-::ToString() const
 {
     // TODO: this is awfully inefficient, anything better?
     wxString result;