make --static flag act on --cppflags too.

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

diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp
index 44415d8dab39dd5924e6fafdef110a406cb5988c..d0cda3912dd7029039d1fdd41e62ec18a6aa00c2 100644 (file)
--- a/src/common/longlong.cpp
+++ b/src/common/longlong.cpp
@@ -28,7 +28,12 @@
 #if wxUSE_LONGLONG
 #include "wx/longlong.h"
 
 #if wxUSE_LONGLONG
 #include "wx/longlong.h"
 

+#if defined(__MWERKS__) && defined(__WXMSW__)
+#include <string.h>     // for memset()
+#else

 #include <memory.h>     // for memset()
 #include <memory.h>     // for memset()

+#endif
+

 #include <math.h>       // for fabs()
 
 // ============================================================================
 #include <math.h>       // for fabs()
 
 // ============================================================================


@@ -609,11 +614,10 @@ void *wxLongLongWx::asArray(void) const
 
 wxString
 #if wxUSE_LONGLONG_NATIVE
 
 wxString
 #if wxUSE_LONGLONG_NATIVE

-wxLongLongNative
+wxLongLongNative::ToString() const

 #else
 #else

-wxLognLongWx
+wxLongLongWx::ToString() const

 #endif
 #endif

-::ToString() const

 {
     // TODO: this is awfully inefficient, anything better?
     wxString result;
 {
     // TODO: this is awfully inefficient, anything better?
     wxString result;