Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Mac: Fix display of OS version in Event Log and stdoutdae.txt. There is no longer a simple correspondence between Darwin and OS X version numbers.

This commit is contained in:
Charlie Fenton 2014-01-21 04:43:05 -08:00
parent 936fad0beb
commit 6e543cd8ad
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
client/client_state.cpp
View File

@ -15,6 +15,11 @@
// You should have received a copy of the GNU Lesser General Public License
// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
#ifdef __APPLE__
#include <Carbon/Carbon.h>
#include <CoreFoundation/CoreFoundation.h>
#endif
#ifdef _WIN32
#include "boinc_win.h"
#else
@ -190,10 +195,25 @@ void CLIENT_STATE::show_host_info() {
"Processor features: %s", host_info.p_features
);
#ifdef __APPLE__
SInt32 temp;
int major, minor, rev;
sscanf(host_info.os_version, "%d.%d.%d", &major, &minor, &rev);
OSStatus err = noErr;
err = Gestalt(gestaltSystemVersionMajor, &temp);
major = temp;
if (!err) {
err = Gestalt(gestaltSystemVersionMinor, &temp);
minor = temp;
}
if (!err) {
err = Gestalt(gestaltSystemVersionBugFix, &temp);
rev = temp;
}
if (err) {
sscanf(host_info.os_version, "%d.%d.%d", &major, &minor, &rev);
}
msg_printf(NULL, MSG_INFO,
"OS: Mac OS X 10.%d.%d (%s %s)", major-4, minor,
"OS: Mac OS X %d.%d.%d (%s %s)", major, minor, rev,
host_info.os_name, host_info.os_version
);
#else