diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-08 14:36:59 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-08 14:36:59 +0200 |
commit | 8d471ab9450d653dd40187f0476365cce0d3ce4f (patch) | |
tree | 02741434eedc74502370c9e9273f14565219ddb7 /runtime/msg.c | |
parent | ba31ca0c288c71a714a93118acfb214879bf7b8f (diff) | |
download | rsyslog-8d471ab9450d653dd40187f0476365cce0d3ce4f.tar.gz rsyslog-8d471ab9450d653dd40187f0476365cce0d3ce4f.tar.xz rsyslog-8d471ab9450d653dd40187f0476365cce0d3ce4f.zip |
bugfix: did not compile under solaris due to $uptime property code
For the time being, $uptime is not supported on Solaris
Diffstat (limited to 'runtime/msg.c')
-rw-r--r-- | runtime/msg.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index e09b8705..5f2efc8c 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -2565,6 +2565,10 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, *pbMustBeFreed = 0; break; case PROP_SYS_UPTIME: +# ifdef OS_SOLARIS + pRes = (uchar*) "UPTIME NOT available under Solaris"; + *pbMustBeFreed = 0; +# else { struct sysinfo s_info; @@ -2580,6 +2584,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, snprintf((char*) pRes, sizeof(uchar) * 32, "%ld", s_info.uptime); } +# endif break; default: /* there is no point in continuing, we may even otherwise render the |