STL compilation fixes.

[wxWidgets.git] / src / unix / baseunix.cpp

diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp
index 99a1bdcd3e8865ce636a921e5c60021ecbe41da6..b265339a06d00621b0ceea033b37d4e9b15fd36c 100644 (file)
--- a/src/unix/baseunix.cpp
+++ b/src/unix/baseunix.cpp
@@ -85,10 +85,8 @@ wxConsoleAppTraits::WaitForChild(wxExecuteData& execData)
 // misc other stuff
 // ----------------------------------------------------------------------------
 
 // 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 wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin)
 {


@@ -110,3 +108,5 @@ int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin)
     return wxUNIX;
 }
 
     return wxUNIX;
 }
 

+#endif // __WXMAC__
+