X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/277d672a9d49e588af8c12db30184ed503faa23e..f47db8f0676be7807693de8bc38c4851c37f56a2:/src/common/longlong.cpp?ds=sidebyside

diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp
index 44415d8dab..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()
 
 // ============================================================================
@@ -609,11 +614,10 @@ void *wxLongLongWx::asArray(void) const
 
 wxString
 #if wxUSE_LONGLONG_NATIVE
-wxLongLongNative
+wxLongLongNative::ToString() const
 #else
-wxLognLongWx
+wxLongLongWx::ToString() const
 #endif
-::ToString() const
 {
     // TODO: this is awfully inefficient, anything better?
     wxString result;