simplify test for 64 bit architectures: just check if the string '64' occurs in the...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 88e0e5101f82f58a7b1387532024c2f85c14a293..73ca6f4c3178f5b6776c114145f25b9dfc1f318b 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -897,16 +897,12 @@ bool wxGetUserName(wxChar *buf, int sz)
 
 bool wxIsPlatform64Bit()
 {
 
 bool wxIsPlatform64Bit()
 {

-    wxString machine = wxGetCommandOutput(wxT("uname -m"));
-
-    // NOTE: these tests are not 100% reliable!
-    return machine.Contains(wxT("AMD64")) ||
-           machine.Contains(wxT("IA64")) ||
-           machine.Contains(wxT("x64")) ||
-           machine.Contains(wxT("X64")) ||
-           machine.Contains(wxT("alpha")) ||
-           machine.Contains(wxT("hppa64")) ||
-           machine.Contains(wxT("ppc64"));
+    const wxString machine = wxGetCommandOutput(wxT("uname -m"));
+
+    // the test for "64" is obviously not 100% reliable but seems to work fine
+    // in practice
+    return machine.Contains(wxT("64")) ||
+                machine.Contains(wxT("alpha"));

 }
 
 // these functions are in mac/utils.cpp for wxMac
 }
 
 // these functions are in mac/utils.cpp for wxMac