From 67320b26b516ac73e1f1f45bde525cef5f4113d1 Mon Sep 17 00:00:00 2001 From: Greg Troxel Date: Mon, 23 Mar 2015 15:16:29 -0400 Subject: [PATCH] Fix alignment assumptions on non-RT_ROUNDUP platforms. The comment said that apple uses int and BSD traditionally used long, but the code was backwards. This fixes apple to be int, and otherwise long. That should make FreeBSD, which aligns to long, work correctly, even without using SA_SIZE. (cherry picked from commit 941789e470199df4f612368f669ecc0fd096fb9a) --- zebra/kernel_socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c index 5d5206a2f9..10fb2d2631 100644 --- a/zebra/kernel_socket.c +++ b/zebra/kernel_socket.c @@ -79,9 +79,9 @@ extern struct zebra_privs_t zserv_privs; /* OS X (Xcode as of 2014-12) is known not to define RT_ROUNDUP */ #ifdef __APPLE__ -#define ROUNDUP_TYPE long -#else #define ROUNDUP_TYPE int +#else +#define ROUNDUP_TYPE long #endif #define ROUNDUP(a) \ -- 2.39.5