avoid macro name collision with system defined macro

(cherry picked from commit 81b133d9638114457b3fc237b25066cc59e221e9)

diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index 2ed0a2a4a99143e3d05426c187447bf753aaa1cf..75a63c1400b2bee3bdd4afc0f46efdb9151d86bc 100644 (file)
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -237,7 +237,7 @@
 /*%
  * 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 229711d238b44038e2d6aea126a4accd2a59d5ff..4412c28446b77a34ea20f59093f37f437f5d5e0b 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -347,8 +347,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.