Commit 81b133d9 authored by Mark Andrews's avatar Mark Andrews

avoid macro name collision with system defined macro

parent e860375d
...@@ -262,7 +262,7 @@ extern void mock_assert(const int result, const char* const expression, ...@@ -262,7 +262,7 @@ extern void mock_assert(const int result, const char* const expression,
/*% /*%
* Alignment * 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 * Misc
......
...@@ -314,8 +314,8 @@ typedef isc_event_t intev_t; ...@@ -314,8 +314,8 @@ typedef isc_event_t intev_t;
#define CMSG_SP_INT 24 #define CMSG_SP_INT 24
/* Align cmsg buffers to be safe on SPARC etc. */ /* 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 RECVCMSGBUFLEN ISC_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 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. * The number of times a send operation is repeated if the result is EINTR.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment