bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change gestalt usage to work on versions < 10.4

This commit is contained in:
Doug MacEachern 2006-10-13 04:26:37 +00:00
parent ec2cb5c854
commit 59fddd3f7c
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/os/darwin/darwin_sigar.c
View File

@ -2189,15 +2189,29 @@ int sigar_os_sys_info_get(sigar_t *sigar,
{ {
#ifdef DARWIN #ifdef DARWIN
char *codename = NULL; char *codename = NULL;
long version_major, version_minor, version_fix; long version, version_major, version_minor, version_fix;
SIGAR_SSTRCPY(sysinfo->name, "MacOSX"); SIGAR_SSTRCPY(sysinfo->name, "MacOSX");
SIGAR_SSTRCPY(sysinfo->vendor_name, "Mac OS X"); SIGAR_SSTRCPY(sysinfo->vendor_name, "Mac OS X");
SIGAR_SSTRCPY(sysinfo->vendor, "Apple"); SIGAR_SSTRCPY(sysinfo->vendor, "Apple");
Gestalt(gestaltSystemVersionMajor, &version_major); if (Gestalt(gestaltSystemVersion, &version) == noErr) {
Gestalt(gestaltSystemVersionMinor, &version_minor); if (version >= 0x00001040) {
Gestalt(gestaltSystemVersionBugFix, &version_fix); Gestalt('sys1' /*gestaltSystemVersionMajor*/, &version_major);
Gestalt('sys2' /*gestaltSystemVersionMinor*/, &version_minor);
Gestalt('sys3' /*gestaltSystemVersionBugFix*/, &version_fix);
}
else {
version_fix = version & 0xf;
version >>= 4;
version_minor = version & 0xf;
version >>= 4;
version_major = version - (version >> 4) * 6;
}
}
else {
return SIGAR_ENOTIMPL;
}
snprintf(sysinfo->vendor_version, snprintf(sysinfo->vendor_version,
sizeof(sysinfo->vendor_version), sizeof(sysinfo->vendor_version),