From 6b516fde4d6e85fce6d6bcb3ab4569dafcd4493e Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Mon, 7 Jun 2010 07:18:07 +0000
Subject: [PATCH] client: Display Mac OS Version as well as Darwin version in
 Event Log

svn path=/trunk/boinc/; revision=21698
---
 checkin_notes           | 6 ++++++
 client/client_state.cpp | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/checkin_notes b/checkin_notes
index ee606a3b9d..84be042aec 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4136,3 +4136,9 @@ David  4 Jun 2010
         ops/
             credit.php
             team_import.php
+
+Charlie  7 Jun 2010
+    - client: Display Mac OS Version as well as Darwin version in Event Log.
+        
+    client/
+        client_state.cpp
diff --git a/client/client_state.cpp b/client/client_state.cpp
index 4cbcbf283e..c78ad4a7aa 100644
--- a/client/client_state.cpp
+++ b/client/client_state.cpp
@@ -159,9 +159,18 @@ void CLIENT_STATE::show_host_info() {
     msg_printf(NULL, MSG_INFO,
         "Processor features: %s", host_info.p_features
     );
+#ifdef __APPLE__
+    int major, minor, rev;
+    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, 
+        host_info.os_name, host_info.os_version
+    );
+#else
     msg_printf(NULL, MSG_INFO,
         "OS: %s: %s", host_info.os_name, host_info.os_version
     );
+#endif
 
     nbytes_to_string(host_info.m_nbytes, 0, buf, sizeof(buf));
     nbytes_to_string(host_info.m_swap, 0, buf2, sizeof(buf2));