diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-16 16:58:15 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-16 16:58:15 +0200 |
| commit | c5178a4d21cf8ca3362b8a8394d0e762801550a4 (patch) | |
| tree | 0916303e0cd18e00397a6eb28a64b32aa5908c4d /expr.c | |
| parent | 65cdfc1777e1c189f28dfe11fa1ab0d08930b458 (diff) | |
| parent | 11a526bcee95dab6a5bf2cc25a07dc6d65eaa177 (diff) | |
| download | rsyslog-c5178a4d21cf8ca3362b8a8394d0e762801550a4.tar.gz rsyslog-c5178a4d21cf8ca3362b8a8394d0e762801550a4.tar.bz2 rsyslog-c5178a4d21cf8ca3362b8a8394d0e762801550a4.zip | |
Merge branch 'master' into beta
3.17.x is the new beta
Conflicts:
ChangeLog
configure.ac
Diffstat (limited to 'expr.c')
| -rw-r--r-- | expr.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -336,7 +336,7 @@ ENDobjConstruct(expr) /* ConstructionFinalizer * rgerhards, 2008-01-09 */ -rsRetVal exprConstructFinalize(expr_t *pThis) +rsRetVal exprConstructFinalize(expr_t __attribute__((unused)) *pThis) { DEFiRet; |