Merge branch 'v4-devel' into master

Conflicts:
	runtime/rsyslog.h
	runtime/wtp.c

1 files changed, 2 insertions, 1 deletions

diff --git a/action.h b/action.h
index 94e1337f..d1805075 100644
--- a/action.h
+++ b/action.h
@@ -84,7 +84,8 @@ struct action_s {
 	SYNC_OBJ_TOOL;		/* required for mutex support */
 	pthread_mutex_t mutActExec; /* mutex to guard actual execution of doAction for single-threaded modules */
 	uchar *pszName;		/* action name (for documentation) */
-	uchar **ppMsgs;		/* pointer to action-calling parameters (kept in structure to save alloc() time!) */
+	//uchar **ppMsgs;		/* pointer to action-calling parameters (kept in structure to save alloc() time!) */
+	void *ppMsgs;		/* pointer to action-calling parameters (kept in structure to save alloc() time!) */
 	size_t *lenMsgs;	/* length of message in ppMsgs */
 };
 typedef struct action_s action_t;