X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8df6de970d7b4e4bc1f8701d1f3ab1adedde8f00..7f0586ef60f9ac456ebad639026c14ed89d46c8b:/src/unix/baseunix.cpp

diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp
index ef7f1e1f9d..b265339a06 100644
--- a/src/unix/baseunix.cpp
+++ b/src/unix/baseunix.cpp
@@ -30,6 +30,7 @@
 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"
+#include "wx/utils.h"
 #include "wx/unix/execute.h"
 
 // for waitpid()
@@ -84,17 +85,15 @@ wxConsoleAppTraits::WaitForChild(wxExecuteData& execData)
 // misc other stuff
 // ----------------------------------------------------------------------------
 
-// WXWIN_OS_DESCRIPTION is normally defined by configure
-#if defined( __MWERKS__ ) && defined(__MACH__)
-    #define WXWIN_OS_DESCRIPTION "MacOS X"
-#endif
+// this is in mac/utils.cpp under Mac
+#ifndef __WXMAC__
 
 int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin)
 {
     int major, minor;
     char name[256];
 
-    if ( sscanf(WXWIN_OS_DESCRIPTION, "%s %d.%d", name, &major, &minor) != 3 )
+    if ( sscanf(WXWIN_OS_DESCRIPTION, "%255s %d.%d", name, &major, &minor) != 3 )
     {
         // unreckognized uname string format
         major =
@@ -109,3 +108,5 @@ int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin)
     return wxUNIX;
 }
 
+#endif // __WXMAC__
+