regenerated makefiles, with support for multilib build

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

diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp
index e6250a0c130a78042e183986abf86fe3ecf33d3d..ef7f1e1f9d20fd5362ec17e57ee93a601b9b92b6 100644 (file)
--- a/src/unix/baseunix.cpp
+++ b/src/unix/baseunix.cpp
@@ -25,9 +25,12 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/log.h"
+    #include "wx/intl.h"

 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"
 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"

+#include "wx/unix/execute.h"

 
 // for waitpid()
 #include <sys/types.h>
 
 // for waitpid()
 #include <sys/types.h>


@@ -98,10 +101,10 @@ int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin)
         minor = -1;
     }
 
         minor = -1;
     }
 

-    if ( majorVsn )
-        *majorVsn = major;
-    if ( minorVsn )
-        *minorVsn = minor;
+    if ( verMaj )
+        *verMaj = major;
+    if ( verMin )
+        *verMin = minor;

 
     return wxUNIX;
 }
 
     return wxUNIX;
 }