diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-07 15:38:57 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-07 15:38:57 +0200 |
commit | 11ee5cbdfb08ba3e42a853c08144fa24cd55d6da (patch) | |
tree | eb981082bfe83c80b74149a1927ff0470b70db62 /plugins/omstdout/omstdout.c | |
parent | 76c9616612a23796349a42d9b236a1cb0b836133 (diff) | |
parent | 156d3f64e7ce50a570c1f8f95f51406c4853aad8 (diff) | |
download | rsyslog-4.8.0.tar.gz rsyslog-4.8.0.tar.xz rsyslog-4.8.0.zip |
Merge branch 'v4-beta' into v4-stable, prep for 4.8.0v4.8.0
There are no changes compared to 4.7.5, just a re-release with the new
version number as new v4-stable. The most important new feature is Solaris
support.
Conflicts:
configure.ac
doc/manual.html
Diffstat (limited to 'plugins/omstdout/omstdout.c')
-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. */ |