Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Joey Salazar
BIND
Commits
81b133d9
Commit
81b133d9
authored
Sep 10, 2018
by
Mark Andrews
Browse files
avoid macro name collision with system defined macro
parent
e860375d
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/isc/include/isc/util.h
View file @
81b133d9
...
...
@@ -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
...
...
lib/isc/unix/socket.c
View file @
81b133d9
...
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment