aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2011-06-30 16:40:35 +0200
committerBjörn-Egil Dahlberg <[email protected]>2011-06-30 16:40:35 +0200
commit97d138b3c0e47e4439333a80efa3493a2c630154 (patch)
treed43d446ba67dcfab6dc12be4f87617435105e92f
parent4050753747730dd36f3bc642e8a691161d75d2c0 (diff)
parent7092c4a41ac0d38ae457c2dc768aa542337d8b8c (diff)
downloadotp-97d138b3c0e47e4439333a80efa3493a2c630154.tar.gz
otp-97d138b3c0e47e4439333a80efa3493a2c630154.tar.bz2
otp-97d138b3c0e47e4439333a80efa3493a2c630154.zip
Merge branch 'dev' into major
* dev: Align ei buffer according to size of pointers
-rw-r--r--lib/erl_interface/src/connect/ei_resolve.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/erl_interface/src/connect/ei_resolve.c b/lib/erl_interface/src/connect/ei_resolve.c
index 50c5a4161d..ba8f8fbce3 100644
--- a/lib/erl_interface/src/connect/ei_resolve.c
+++ b/lib/erl_interface/src/connect/ei_resolve.c
@@ -185,7 +185,12 @@ static int verify_dns_configuration(void)
* align: increment buf until it is dword-aligned, reduce len by same amount.
* advance: increment buf by n bytes, reduce len by same amount .
*/
-#define align_buf(buf,len) for (;(((unsigned)buf)&0x3); (buf)++, len--)
+#if defined SIZEOF_VOID_P
+#define ALIGNBYTES (SIZEOF_VOID_P - 1)
+#else
+#define ALIGNBYTES (sizeof(void*) - 1)
+#endif
+#define align_buf(buf,len) for (;(((unsigned)buf) & ALIGNBYTES); (buf)++, len--)
#define advance_buf(buf,len,n) ((buf)+=(n),(len)-=(n))
/* "and now the tricky part..." */