diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-14 17:48:35 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-14 17:48:35 +0100 |
| commit | eb659a82ded377db65c3878d7170b7be1542d926 (patch) | |
| tree | a377c7a08a4cfa8912772ff0de6ec5675e77e24e /runtime/msg.c | |
| parent | 62ab1c20b3f40014efa9448bd45da4c333b225c2 (diff) | |
| parent | c0f5dd3fbf877799ac8fec4d00b2f2c69014b413 (diff) | |
| download | rsyslog-eb659a82ded377db65c3878d7170b7be1542d926.tar.gz rsyslog-eb659a82ded377db65c3878d7170b7be1542d926.tar.bz2 rsyslog-eb659a82ded377db65c3878d7170b7be1542d926.zip | |
Merge branch 'v7-stable'
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 5b6392b2..d648bb92 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -3073,8 +3073,8 @@ 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"; +# ifndef HAVE_SYSINFO + pRes = (uchar*) "UPTIME NOT available on this system"; *pbMustBeFreed = 0; # else { |