diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-10-10 02:22:06 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-10-10 02:22:06 +0200 |
| commit | 2aeaadaf0b908cbec7f0501458eca65ebaa7b33b (patch) | |
| tree | c9dc0020a9ac7c0fc64fcc14a47c6fda1657f39c /lib/erl_interface | |
| parent | e5a1aa05455574f6220887fea7ba61b833062fe9 (diff) | |
| download | otp-2aeaadaf0b908cbec7f0501458eca65ebaa7b33b.tar.gz otp-2aeaadaf0b908cbec7f0501458eca65ebaa7b33b.tar.bz2 otp-2aeaadaf0b908cbec7f0501458eca65ebaa7b33b.zip | |
erl_interface: Avoid redefinition of ALIGNBYTES
Changed to EI_ALIGNBYTES
Diffstat (limited to 'lib/erl_interface')
| -rw-r--r-- | lib/erl_interface/src/connect/ei_resolve.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/erl_interface/src/connect/ei_resolve.c b/lib/erl_interface/src/connect/ei_resolve.c index ba8f8fbce3..79d259b92d 100644 --- a/lib/erl_interface/src/connect/ei_resolve.c +++ b/lib/erl_interface/src/connect/ei_resolve.c @@ -186,11 +186,11 @@ static int verify_dns_configuration(void) * advance: increment buf by n bytes, reduce len by same amount . */ #if defined SIZEOF_VOID_P -#define ALIGNBYTES (SIZEOF_VOID_P - 1) +#define EI_ALIGNBYTES (SIZEOF_VOID_P - 1) #else -#define ALIGNBYTES (sizeof(void*) - 1) +#define EI_ALIGNBYTES (sizeof(void*) - 1) #endif -#define align_buf(buf,len) for (;(((unsigned)buf) & ALIGNBYTES); (buf)++, len--) +#define align_buf(buf,len) for (;(((unsigned)buf) & EI_ALIGNBYTES); (buf)++, len--) #define advance_buf(buf,len,n) ((buf)+=(n),(len)-=(n)) /* "and now the tricky part..." */ @@ -282,6 +282,8 @@ static int copy_hostent(struct hostent *dest, const struct hostent *src, char *b return 0; } +#undef EI_ALIGNBYTES + /* This function is a pseudo-reentrant version of gethostbyname(). It * uses locks to serialize the call to the regular (non-reentrant) * gethostbyname() and then copies the data into the user-provided |