- Fix cmsg alignment for argument to sendmsg on NetBSD.

git-svn-id: file:///svn/unbound/trunk@3608 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 1c8221018fe8145786e95b5eaacbf3b5beb1ecc9..c778a16164139ec970fcaa16057688cc0dc8caa3 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
        - Fix #734: chown the pidfile if it resides inside the chroot.
        - Use arc4random instead of random in tests (because it is
          available, possibly as compat, anyway).
+       - Fix cmsg alignment for argument to sendmsg on NetBSD.
 
 25 January 2016: Wouter
        - Fix #738: Swig should not be invoked with CPPFLAGS.

diff --git a/util/netevent.c b/util/netevent.c
index 614446806d1aa5d49bb452097390151f49abaec1..1f182a025b8e95f8443ed764f60eee3ea027e026 100644 (file)
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -56,7 +56,9 @@
 /* -------- Start of local definitions -------- */
 /** if CMSG_ALIGN is not defined on this platform, a workaround */
 #ifndef CMSG_ALIGN
-#  ifdef _CMSG_DATA_ALIGN
+#  ifdef __CMSG_ALIGN
+#    define CMSG_ALIGN(n) __CMSG_ALIGN(n)
+#  elif defined(CMSG_DATA_ALIGN)
 #    define CMSG_ALIGN _CMSG_DATA_ALIGN
 #  else
 #    define CMSG_ALIGN(len) (((len)+sizeof(long)-1) & ~(sizeof(long)-1))