From 6b0792e009d2da47293ff75ebe178960512464cc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 4 Jul 2007 22:33:59 +0000 Subject: [PATCH] simplify test for 64 bit architectures: just check if the string '64' occurs in the arch string, this also covers more cases [backport of rev 47127 from trunk] git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/utilsunx.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index 95dbf82091..f5440a2f5a 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -895,16 +895,12 @@ bool wxGetUserName(wxChar *buf, int sz) bool wxIsPlatform64Bit() { - wxString machine = wxGetCommandOutput(wxT("uname -m")); + const 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")); + // 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