diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 12:48:15 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 12:48:15 +0200 |
commit | 1d41b9540ccf8b6714135737855ab71ee75f4364 (patch) | |
tree | 2ce7356d2d4fcb4426edfd7e0ddd473bbed4baf5 /runtime/stringbuf.c | |
parent | 579c61e579d9452682da51ec5e4b547684573807 (diff) | |
parent | 831ce25230f6c8cd7c362fda3616e1233a61cf00 (diff) | |
download | rsyslog-1d41b9540ccf8b6714135737855ab71ee75f4364.tar.gz rsyslog-1d41b9540ccf8b6714135737855ab71ee75f4364.tar.xz rsyslog-1d41b9540ccf8b6714135737855ab71ee75f4364.zip |
Merge branch 'v4-stable' into v4-devel
Conflicts:
tcpsrv.c
tests/Makefile.am
tests/tcpflood.c
Diffstat (limited to 'runtime/stringbuf.c')
-rw-r--r-- | runtime/stringbuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/stringbuf.c b/runtime/stringbuf.c index 93995b38..8b2fe455 100644 --- a/runtime/stringbuf.c +++ b/runtime/stringbuf.c @@ -156,7 +156,7 @@ rsRetVal rsCStrExtendBuf(cstr_t *pThis, size_t iMinNeeded) { uchar *pNewBuf; - unsigned short iNewSize; + size_t iNewSize; DEFiRet; /* first compute the new size needed */ |