From 218b0c0331beb2a5d28a6b8d0fddad1b06b1b82d Mon Sep 17 00:00:00 2001
From: Martin Carpenter <mcarpenter@free.fr>
Date: Tue, 27 Nov 2012 10:09:16 +0100
Subject: Check that sysinfo(2) can return uptime

---
 runtime/msg.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 10605ba4..32a02424 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -36,7 +36,9 @@
 #include <assert.h>
 #include <ctype.h>
 #include <sys/socket.h>
+#if HAVE_SYSINFO_UPTIME
 #include <sys/sysinfo.h>
+#endif
 #include <netdb.h>
 #include <libestr.h>
 #include <json/json.h>
@@ -2773,7 +2775,10 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 			*pbMustBeFreed = 0;
 			break;
 		case PROP_SYS_UPTIME:
-#			ifndef HAVE_SYSINFO
+#			ifndef HAVE_SYSINFO_UPTIME
+            /* An alternative on some systems (eg Solaris) is to scan
+             * /var/adm/utmpx for last boot time.
+             */
 			pRes = (uchar*) "UPTIME NOT available on this system";
 			*pbMustBeFreed = 0;
 #			else
-- 
cgit v1.2.3