From f902c9ca4891dcd65fd1f4b8bba0d23c75451dcd Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 21 Apr 2010 18:25:17 +0100
Subject: removed some complier warnings

---
 runtime/rsyslog.h | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'runtime/rsyslog.h')

diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h
index 09dc7ae6..acc31a99 100644
--- a/runtime/rsyslog.h
+++ b/runtime/rsyslog.h
@@ -60,6 +60,11 @@
 #endif
 
 
+/* 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.
+*/
+
 /* define some base data types */
 typedef unsigned char uchar;/* get rid of the unhandy "unsigned char" */
 typedef struct thrdInfo thrdInfo_t;
@@ -78,8 +83,13 @@ typedef struct nsd_gsspi_s nsd_gsspi_t;
 typedef struct nsd_nss_s nsd_nss_t;
 typedef struct nsdsel_ptcp_s nsdsel_ptcp_t;
 typedef struct nsdsel_gtls_s nsdsel_gtls_t;
-typedef obj_t nsd_t;
-typedef obj_t nsdsel_t;
+#ifdef OS_SOLARIS
+	typedef void nsd_t;
+	typedef void nsdsel_t;
+#else
+	typedef obj_t nsd_t;
+	typedef obj_t nsdsel_t;
+#endif
 typedef struct msg msg_t;
 typedef struct prop_s prop_t;
 typedef struct interface_s interface_t;
-- 
cgit