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

1 files changed, 2 insertions, 1 deletions

diff --git a/action.h b/action.h
index 579a1215..c4ef94bb 100644
--- a/action.h
+++ b/action.h
@@ -74,7 +74,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;