--- snort-2.6.1.4-orig/src/decode.h     2007-03-19 14:31:33.000000000 +0100
+++ snort-2.6.1.4/src/decode.h  2007-04-07 02:32:02.851976653 +0200
@@ -885,6 +885,7 @@
 #endif
 #endif

+#ifndef DNET_IP6_H
 struct ip6_hdr
 {
     union
@@ -908,6 +909,7 @@
 #define ip6_plen  ip6_ctlun.ip6_un1.ip6_un1_plen
 #define ip6_nxt   ip6_ctlun.ip6_un1.ip6_un1_nxt
 #define ip6_hlim  ip6_ctlun.ip6_un1.ip6_un1_hlim
+#endif
 #define ip6_hops  ip6_ctlun.ip6_un1.ip6_un1_hlim

 /* Fragment header */