summaryrefslogtreecommitdiff
path: root/ripngd
diff options
context:
space:
mode:
authorpaul <paul>2004-05-11 12:01:33 +0000
committerpaul <paul>2004-05-11 12:01:33 +0000
commitf88258c8386a6a5f4a7a7994a1d3a34ab0ef244b (patch)
tree91e1fc4ba86a8bdd1c7e07fcf4d31612b96236c0 /ripngd
parentc50ae8baf610d3d041fdedb78df205c999be57a9 (diff)
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.
Diffstat (limited to 'ripngd')
-rw-r--r--ripngd/ChangeLog6
-rw-r--r--ripngd/ripng_nexthop.h5
2 files changed, 11 insertions, 0 deletions
diff --git a/ripngd/ChangeLog b/ripngd/ChangeLog
index 01256bbb..8122ec55 100644
--- 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 2213fc2a..50a86ad0 100644
--- 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]