浏览代码

modules/sipcapture: fixed defines for Solaris

Jason Penton 12 年之前
父节点
当前提交
da1d8d1a93
共有 2 个文件被更改,包括 5 次插入10 次删除
  1. 3 2
      modules/sipcapture/hep.h
  2. 2 8
      modules/sipcapture/sipcapture.h

+ 3 - 2
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));
 

+ 2 - 8
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