diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-13 02:39:42 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-13 02:39:42 +0200 |
| commit | 7903677bfba6fd897010d9c5dbb56531bfe0d825 (patch) | |
| tree | 110e409834bab0fb1edd8f869e911c8d8d510493 /runtime/prop.c | |
| parent | ad777330629c31447018e47b4033a7ebaa9fe655 (diff) | |
| parent | 15921d4e4e9d03e0cfd4ca5a9745c89b5dcd37c3 (diff) | |
| download | rsyslog-7903677bfba6fd897010d9c5dbb56531bfe0d825.tar.gz rsyslog-7903677bfba6fd897010d9c5dbb56531bfe0d825.tar.bz2 rsyslog-7903677bfba6fd897010d9c5dbb56531bfe0d825.zip | |
Merge branch 'v7-stable' into v7-stable-tlsfix
Conflicts:
ChangeLog
runtime/rsyslog.h
Diffstat (limited to 'runtime/prop.c')
| -rw-r--r-- | runtime/prop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/prop.c b/runtime/prop.c index 9d5927fd..cb89fac0 100644 --- a/runtime/prop.c +++ b/runtime/prop.c @@ -100,7 +100,7 @@ static int GetStringLen(prop_t *pThis) /* get string */ -static rsRetVal GetString(prop_t *pThis, uchar **ppsz, int *plen) +rsRetVal GetString(prop_t *pThis, uchar **ppsz, int *plen) { BEGINfunc ISOBJ_TYPE_assert(pThis, prop); |