2004-05-11 Paul Jakma <paul@dishone.st>

        * ripng_nexthop.h: SUNOS_5 does not define s6_addr32
          catch ifndef(s6_addr32) && defined(SUNOS_5) and define
          it ourselves based on the S10 _KERNEL guarded define.

diff --git a/ripngd/ChangeLog b/ripngd/ChangeLog
index 01256bbb589d639113a0d3725d172fd33fc7a51d..8122ec55e31b2f67708fecbe23ec4073ad125701 100644 (file)
--- a/ripngd/ChangeLog
+++ b/ripngd/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-11 Paul Jakma <paul@dishone.st>
+
+       * ripng_nexthop.h: SUNOS_5 does not define s6_addr32
+         catch ifndef(s6_addr32) && defined(SUNOS_5) and define
+         it ourselves based on the S10 _KERNEL guarded define.
+         
 2004-05-08 Paul Jakma <paul@dishone.st>
 
        * ripng_{interface,zebra}.c: sync with zclient changes

diff --git a/ripngd/ripng_nexthop.h b/ripngd/ripng_nexthop.h
index 2213fc2aeb913aa0ec4472e1c54a1709fd42002c..50a86ad0262e1c8aaf118300608267fa9fef7162 100644 (file)
--- a/ripngd/ripng_nexthop.h
+++ b/ripngd/ripng_nexthop.h
@@ -43,7 +43,12 @@ static inline int
 addr6_cmp(struct in6_addr *A, struct in6_addr *B) {
 
 #ifndef s6_addr32
+#if defined(SUNOS_5)
+/* Some SunOS define s6_addr32 only to kernel */
+#define s6_addr32 _S6_un._S6_u32
+#else
 #define s6_addr32 __u6_addr.__u6_addr32
+#endif /* SUNOS_5 */
 #endif /*s6_addr32*/
 
 #define a(i) A->s6_addr32[i]