arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Apple feature detection (GH #685)

pull/687/head
Jeffrey Walton 2018-07-14 08:40:06 -04:00
parent d11a7b3436
commit 7a67e43b27
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cpu.cpp
View File

@ -77,19 +77,21 @@ void GetAppleMachineInfo(unsigned int& device, unsigned int& version)
uname(&systemInfo); uname(&systemInfo);
std::string machine(systemInfo.machine); std::string machine(systemInfo.machine);
if (machine.find("PowerMac") || machine.find("Power Macintosh")) if (machine.find("PowerMac") != std::string::npos ||
machine.find("Power Macintosh") != std::string::npos)
device = PowerMac; device = PowerMac;
else if (machine.find("Mac") || machine.find("Macintosh")) else if (machine.find("Mac") != std::string::npos ||
machine.find("Macintosh") != std::string::npos)
device = Mac; device = Mac;
else if (machine.find("iPhone")) else if (machine.find("iPhone") != std::string::npos)
device = iPhone; device = iPhone;
else if (machine.find("iPod")) else if (machine.find("iPod") != std::string::npos)
device = iPod; device = iPod;
else if (machine.find("iPad")) else if (machine.find("iPad") != std::string::npos)
device = iPad; device = iPad;
else if (machine.find("AppleTV")) else if (machine.find("AppleTV") != std::string::npos)
device = AppleTV; device = AppleTV;
else if (machine.find("AppleWatch")) else if (machine.find("AppleWatch") != std::string::npos)
device = AppleWatch; device = AppleWatch;
std::string::size_type pos = machine.find_first_of("0123456789"); std::string::size_type pos = machine.find_first_of("0123456789");