diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-25 10:06:10 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-25 10:06:10 +0200 |
| commit | 2005d52a8babf01c5a6d276e726185c8a932ac1f (patch) | |
| tree | 0d284870c4fc5947ef124fc5ee0b823a07f49f19 /runtime/msg.c | |
| parent | ef5887e864307486f0fe07a23ed9ea7c4789dc11 (diff) | |
| parent | 5941ce7720393d28f04fac817ebcd21936c1ec8d (diff) | |
| download | rsyslog-2005d52a8babf01c5a6d276e726185c8a932ac1f.tar.gz rsyslog-2005d52a8babf01c5a6d276e726185c8a932ac1f.tar.bz2 rsyslog-2005d52a8babf01c5a6d276e726185c8a932ac1f.zip | |
Merge branch 'v7-stable'
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 8c50b7b3..9d5fa883 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -2995,7 +2995,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, pRes = (uchar*) "UPTIME NOT available on this system"; *pbMustBeFreed = 0; -# elseif defined(__FreeBSD__) +# elif defined(__FreeBSD__) { struct timespec tp; |