diff options
Diffstat (limited to 'usr/src/lib/libresolv2')
| -rw-r--r-- | usr/src/lib/libresolv2/common/isc/eventlib_p.h | 4 | ||||
| -rw-r--r-- | usr/src/lib/libresolv2/include/port_after.h | 9 | ||||
| -rw-r--r-- | usr/src/lib/libresolv2/include/port_before.h | 11 |
3 files changed, 12 insertions, 12 deletions
diff --git a/usr/src/lib/libresolv2/common/isc/eventlib_p.h b/usr/src/lib/libresolv2/common/isc/eventlib_p.h index 28aa9fb25d..32b47c1c9c 100644 --- a/usr/src/lib/libresolv2/common/isc/eventlib_p.h +++ b/usr/src/lib/libresolv2/common/isc/eventlib_p.h @@ -1,5 +1,5 @@ /* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -189,7 +189,7 @@ typedef struct { ctx->field.result = lastnext; /* Any value other than EV_* values from <isc/eventlib.h> will do */ -#define EV_WASNONBLOCKING 4000000001 +#define EV_WASNONBLOCKING 4000000001U extern short *__fd_eventfield(int fd, __evEmulMask *maskp); extern short __poll_event(__evEmulMask *maskp); diff --git a/usr/src/lib/libresolv2/include/port_after.h b/usr/src/lib/libresolv2/include/port_after.h index 2f449c0a7a..45b94dbd05 100644 --- a/usr/src/lib/libresolv2/include/port_after.h +++ b/usr/src/lib/libresolv2/include/port_after.h @@ -291,4 +291,13 @@ int isc__gettimeofday(struct timeval *, struct timezone *); _u.k = konst; \ var = _u.v; \ } while (0) + +#ifndef ALIGN +#if (OS_MAJOR == 5 && OS_MINOR > 8) +#define ALIGN(x) (((uintptr_t)(x) + (sizeof(char*) - 1UL)) & ~(sizeof(char*) - 1UL)) +#else +#define ALIGN(x) (((unsigned long)(x) + (sizeof(char*) - 1UL)) & ~(sizeof(char*) - 1UL)) +#endif +#endif + #endif /* ! PORT_AFTER_H */ diff --git a/usr/src/lib/libresolv2/include/port_before.h b/usr/src/lib/libresolv2/include/port_before.h index 32595ef5e0..18b9291f3b 100644 --- a/usr/src/lib/libresolv2/include/port_before.h +++ b/usr/src/lib/libresolv2/include/port_before.h @@ -1,5 +1,5 @@ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -130,15 +130,6 @@ #define ISC_FORMAT_PRINTF(fmt, args) #endif -/* - * Several files in the ISC distribution use an ALIGN macro which doesn't - * appear to be defined anywhere. From the context, it's intended to round - * up its argument to the nearest suitable boundary. We'll guess that eight - * byte alignment is sufficient. - */ -#define ALIGN(p) (uint64_t)(((uintptr_t)(p) + (sizeof (uint64_t) - 1)) \ - & ~(sizeof (uint64_t) - 1)) - #ifdef SUNW_SYNONYMS #include "synonyms.h" #endif |