diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-21 18:16:57 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-21 18:16:57 +0100 |
| commit | 236c96ffb124074d6efe3382b4d1b77da9a2986a (patch) | |
| tree | 6edee7103c78c1b65e6fbb039f8fe96d60618869 | |
| parent | d02bd7b837e6b0b47df797cf61a6a8eb80bace7c (diff) | |
| download | rsyslog-236c96ffb124074d6efe3382b4d1b77da9a2986a.tar.gz rsyslog-236c96ffb124074d6efe3382b4d1b77da9a2986a.tar.xz rsyslog-236c96ffb124074d6efe3382b4d1b77da9a2986a.zip | |
cleanup of some compiler warnings
| -rw-r--r-- | runtime/rsyslog.h | 16 | ||||
| -rw-r--r-- | runtime/wtp.c | 6 |
2 files changed, 17 insertions, 5 deletions
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; diff --git a/runtime/wtp.c b/runtime/wtp.c index ab7ca4bb..649ffa5a 100644 --- a/runtime/wtp.c +++ b/runtime/wtp.c @@ -329,11 +329,13 @@ 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:"; 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 BEGINfunc ISOBJ_TYPE_assert(pWti, wti); |