diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-11 11:48:29 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-11 11:48:29 +0100 |
commit | b941f68aaeec4bd458328e09121b623ac63f6dd6 (patch) | |
tree | 3bd6490dbcb77ad72bdb186a02f3bf297607964a /runtime/stringbuf.c | |
parent | 819ac126e2cc85916bee32575c85b3c8d7317325 (diff) | |
parent | 2d67035d1b851bdfb430e6980ca217c1807b3a9c (diff) | |
download | rsyslog-b941f68aaeec4bd458328e09121b623ac63f6dd6.tar.gz rsyslog-b941f68aaeec4bd458328e09121b623ac63f6dd6.tar.bz2 rsyslog-b941f68aaeec4bd458328e09121b623ac63f6dd6.zip |
Merge branch 'v5-beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
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 f4a9caae..d8c5923b 100644 --- a/runtime/stringbuf.c +++ b/runtime/stringbuf.c @@ -185,7 +185,7 @@ rsRetVal rsCStrExtendBuf(cstr_t *pThis, size_t iMinNeeded) { uchar *pNewBuf; - unsigned short iNewSize; + size_t iNewSize; DEFiRet; /* first compute the new size needed */ |