summaryrefslogtreecommitdiffstats
path: root/tools/syslogd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-05 13:39:58 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-05 13:39:58 +0200
commitcde0ac2b0c99a4ed1a7f47a14e0e84b57877a97b (patch)
treed7119adeb9fa3eb2d17f5fae7b8f6c06d64ce0b4 /tools/syslogd.c
parent189c0284c11f8a9a689baf0c1f122a06a421058b (diff)
parent54c375eb5b28d70fca023f7ca2fcc2cd0a4fa7ba (diff)
downloadrsyslog-cde0ac2b0c99a4ed1a7f47a14e0e84b57877a97b.tar.gz
rsyslog-cde0ac2b0c99a4ed1a7f47a14e0e84b57877a97b.tar.xz
rsyslog-cde0ac2b0c99a4ed1a7f47a14e0e84b57877a97b.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac doc/manual.html tools/omfile.c
Diffstat (limited to 'tools/syslogd.c')
-rw-r--r--tools/syslogd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 608fb5df..0f4f8a23 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -1788,7 +1788,7 @@ static void doexit()
/* set the maximum message size */
-static rsRetVal setMaxMsgSize(void __attribute__((unused)) *pVal, int iNewVal)
+static rsRetVal setMaxMsgSize(void __attribute__((unused)) *pVal, long iNewVal)
{
return glbl.SetMaxLine(iNewVal);
}