From: Mark Andrews <marka@isc.org>
Date: Sun, 9 Sep 2018 23:18:17 +0000 (+1000)
Subject: avoid macro name collision with system defined macro
X-Git-Tag: v9.13.4~154^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81b133d9638114457b3fc237b25066cc59e221e9;p=thirdparty%2Fbind9.git

avoid macro name collision with system defined macro
---

diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index acc3d64c649..2343bebd97f 100644
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -262,7 +262,7 @@ extern void mock_assert(const int result, const char* const expression,
 /*%
  * Alignment
  */
-#define ALIGN(x, a) (((x) + (a) - 1) & ~((typeof(x))(a)-1))
+#define ISC_ALIGN(x, a) (((x) + (a) - 1) & ~((typeof(x))(a)-1))
 
 /*%
  * Misc
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index f59a85e5cc2..2aebb46ac0c 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -314,8 +314,8 @@ typedef isc_event_t intev_t;
 #define CMSG_SP_INT 24
 
 /* Align cmsg buffers to be safe on SPARC etc. */
-#define RECVCMSGBUFLEN ALIGN(2*(CMSG_SP_IN6PKT + CMSG_SP_TIMESTAMP + CMSG_SP_TCTOS)+1, sizeof(void*))
-#define SENDCMSGBUFLEN ALIGN(2*(CMSG_SP_IN6PKT + CMSG_SP_INT + CMSG_SP_TCTOS)+1, sizeof(void*))
+#define RECVCMSGBUFLEN ISC_ALIGN(2*(CMSG_SP_IN6PKT + CMSG_SP_TIMESTAMP + CMSG_SP_TCTOS)+1, sizeof(void*))
+#define SENDCMSGBUFLEN ISC_ALIGN(2*(CMSG_SP_IN6PKT + CMSG_SP_INT + CMSG_SP_TCTOS)+1, sizeof(void*))
 
 /*%
  * The number of times a send operation is repeated if the result is EINTR.