ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '532-master-doesn-t-build-on-macos-due-to-class-of-align-macros-v9_11' into 'v9_11'

Browse Source 
Resolve "master doesn't build on MacOS due to class of ALIGN macros"

See merge request isc-projects/bind9!776
This commit is contained in:
Mark Andrews
2018-09-09 19:39:43 -04:00
parent b63e33b043 ced589e379
commit 2f87a517b1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/isc/include/isc/util.h
View File

@@ -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

4
lib/isc/unix/socket.c
View File

@@ -348,8 +348,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.