diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/rsyslog.h | 14 | ||||
| -rw-r--r-- | runtime/wtp.c | 6 |
2 files changed, 16 insertions, 4 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; diff --git a/runtime/wtp.c b/runtime/wtp.c index 0c66dd11..271c6f0d 100644 --- a/runtime/wtp.c +++ b/runtime/wtp.c @@ -421,13 +421,15 @@ wtpWrkrExecCancelCleanup(void *arg) static void * wtpWorker(void *arg) /* the arg is actually a wti object, even though we are in wtp! */ { - uchar *pszDbgHdr; - uchar thrdName[32] = "rs:"; DEFiRet; DEFVARS_mutexProtection; wti_t *pWti = (wti_t*) arg; wtp_t *pThis; sigset_t sigSet; +# if HAVE_PRCTL && defined PR_SET_NAME + uchar *pszDbgHdr; + uchar thrdName[32] = "rs:"; +# endif ISOBJ_TYPE_assert(pWti, wti); pThis = pWti->pWtp; |