]> git.puffer.fish Git - matthieu/frr.git/commitdiff
solaris: no ROUNDUP
authorDavid Lamparter <equinox@opensourcerouting.org>
Wed, 16 Sep 2015 02:35:41 +0000 (19:35 -0700)
committerDaniel Walton <dwalton@cumulusnetworks.com>
Thu, 26 May 2016 15:33:32 +0000 (15:33 +0000)
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
(cherry picked from commit a2b503131b188292ede08df99309bcbef4bd1a52)

zebra/kernel_socket.c

index 2a24fbecf5703daf28ed1898fcd9c2cad2d67cbe..4a1081865d9f88a929cee973b0a08bc37c8acd1d 100644 (file)
@@ -69,6 +69,12 @@ extern struct zebra_privs_t zserv_privs;
 #define ROUNDUP(a)     RT_ROUNDUP(a)
 #endif /* defined(RT_ROUNDUP) */
 
+#if defined(SUNOS_5)
+/* Solaris has struct sockaddr_in[6] definitions at 16 / 32 bytes size,
+ * so the whole concept doesn't really apply. */
+#define ROUNDUP(a)      (a)
+#endif
+
 /*
  * If ROUNDUP has not yet been defined in terms of platform-provided
  * defines, attempt to cope with heuristics.