diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-23 11:43:00 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-23 11:43:00 +0100 |
| commit | c4b0f6bcae4761cc7c41a2b07043a1bec00ad6e6 (patch) | |
| tree | 48d9110b63e34c59c1648df3ff8a7049327bc487 /plugins | |
| parent | 236c96ffb124074d6efe3382b4d1b77da9a2986a (diff) | |
| parent | 3a12d05433153d5c7c84f85af6b5039fbcdd1d09 (diff) | |
| download | rsyslog-c4b0f6bcae4761cc7c41a2b07043a1bec00ad6e6.tar.gz rsyslog-c4b0f6bcae4761cc7c41a2b07043a1bec00ad6e6.tar.xz rsyslog-c4b0f6bcae4761cc7c41a2b07043a1bec00ad6e6.zip | |
Merge branch 'v4-devel' into master
Conflicts:
runtime/rsyslog.h
runtime/wtp.c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/omstdout/omstdout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/omstdout/omstdout.c b/plugins/omstdout/omstdout.c index b3ec6287..929de703 100644 --- a/plugins/omstdout/omstdout.c +++ b/plugins/omstdout/omstdout.c @@ -103,7 +103,7 @@ CODESTARTdoAction * So this code here is also more or less an example of how to do that. * rgerhards, 2009-04-03 */ - szParams = (char**) (ppString[0]); + szParams = (char**)(void*) (ppString[0]); /* In array-passing mode, ppString[] contains a NULL-terminated array * of char *pointers. */ |