From 236c96ffb124074d6efe3382b4d1b77da9a2986a Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 21 Apr 2010 18:16:57 +0100 Subject: cleanup of some compiler warnings --- runtime/rsyslog.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'runtime/rsyslog.h') diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index 61bfc122..bdbc0648 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -79,6 +79,10 @@ #define CORE_FEATURE_BATCHING 1 /*#define CORE_FEATURE_whatever 2 ... and so on ... */ +/* under Solaris (actually only SPARC), we need to redefine some types + * to be void, so that we get void* pointers. Otherwise, we will see + * alignment errors. + */ /* some universal fixed size integer defines ... */ typedef long long int64; typedef long long unsigned uint64; @@ -108,9 +112,15 @@ typedef struct nsdsel_ptcp_s nsdsel_ptcp_t; typedef struct nsdsel_gtls_s nsdsel_gtls_t; typedef struct nsdpoll_ptcp_s nsdpoll_ptcp_t; typedef struct wti_s wti_t; -typedef obj_t nsd_t; -typedef obj_t nsdsel_t; -typedef obj_t nsdpoll_t; +#ifdef OS_SOLARIS + typedef void nsd_t; + typedef void nsdsel_t; + typedef void nsdpoll_t; +#else + typedef obj_t nsd_t; + typedef obj_t nsdsel_t; + typedef obj_t nsdpoll_t; +#endif typedef struct msg msg_t; typedef struct queue_s qqueue_t; typedef struct prop_s prop_t; -- cgit