[sr-dev] git:master: modules/sipcapture: fixed defines for Solaris

Module: sip-router Branch: master Commit: da1d8d1a9315d187b050468aa33772253f10e47b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da1d8d1… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Mon Jan 7 12:47:11 2013 +0200 modules/sipcapture: fixed defines for Solaris --- modules/sipcapture/hep.h | 5 +++-- modules/sipcapture/sipcapture.h | 10 ++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/modules/sipcapture/hep.h b/modules/sipcapture/hep.h index 122f943..ea0046e 100644 --- a/modules/sipcapture/hep.h +++ b/modules/sipcapture/hep.h @@ -30,6 +30,7 @@ #ifdef __OS_solaris typedef uint8_t u_int8_t; typedef uint16_t u_int16_t; +typedef uint32_t u_int32_t; #define IPPROTO_IPIP IPPROTO_ENCAP /* Solaris IPIP protocol has name ENCAP */ #endif @@ -154,11 +155,11 @@ struct hep_generic_recv { #ifdef USE_IPV6 hep_chunk_ip6_t *hep_src_ip6; hep_chunk_ip6_t *hep_dst_ip6; -#endif +#endif hep_chunk_uint8_t *proto_t; hep_chunk_uint32_t *capt_id; hep_chunk_uint16_t *keep_tm; - hep_chunk_str_t *auth_key; + hep_chunk_str_t *auth_key; hep_chunk_t *payload_chunk; } __attribute__((packed)); diff --git a/modules/sipcapture/sipcapture.h b/modules/sipcapture/sipcapture.h index 89fd1da..08707e5 100644 --- a/modules/sipcapture/sipcapture.h +++ b/modules/sipcapture/sipcapture.h @@ -23,12 +23,6 @@ * */ -#ifdef __OS_solaris -typedef uint8_t u_int8_t; -typedef uint16_t u_int16_t; -#define IPPROTO_IPIP IPPROTO_ENCAP /* Solaris IPIP protocol has name ENCAP */ -#endif - struct _sipcapture_object { str method; str reply_reason; @@ -64,8 +58,8 @@ struct _sipcapture_object { str rtp_stat; int type; long long tmstamp; - str node; - str msg; + str node; + str msg; #ifdef STATISTICS stat_var *stat; #endif