summaryrefslogtreecommitdiffstats
path: root/runtime/rsyslog.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-04-21 18:25:17 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-04-21 18:25:17 +0100
commitf902c9ca4891dcd65fd1f4b8bba0d23c75451dcd (patch)
treef06d5b63514cb3ea403253a5373526e209d224b6 /runtime/rsyslog.h
parentb526e3d92f214aa2a3d0e3c2746884e9a9dba411 (diff)
downloadrsyslog-f902c9ca4891dcd65fd1f4b8bba0d23c75451dcd.tar.gz
rsyslog-f902c9ca4891dcd65fd1f4b8bba0d23c75451dcd.tar.xz
rsyslog-f902c9ca4891dcd65fd1f4b8bba0d23c75451dcd.zip
removed some complier warnings
Diffstat (limited to 'runtime/rsyslog.h')
-rw-r--r--runtime/rsyslog.h14
1 files changed, 12 insertions, 2 deletions
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;