diff options
| author | Adi Masputra <adi.masputra@sun.com> | 2000-03-06 19:38:12 +0000 |
|---|---|---|
| committer | Adi Masputra <adi.masputra@sun.com> | 2000-03-06 19:38:12 +0000 |
| commit | 4ffad8f3fba25ae1a393a523f8526841b81056f5 (patch) | |
| tree | fd7e9c2418437be4df72a5c6f33ad530736139ed /modules | |
| parent | baf120b604ced444e816f4b362ccca4b123b0fcf (diff) | |
| download | ppp-4ffad8f3fba25ae1a393a523f8526841b81056f5.tar.gz | |
The usage of intptr_t was completely a bad choice, since it's not
defined in 2.5.1 and earlier, including SunOS 4.x. A type definition
is now added (with support for LP64 as well) in order to avoid this
compilation problem across older Solaris releases.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/ppp_ahdlc.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/modules/ppp_ahdlc.c b/modules/ppp_ahdlc.c index 1a821af..4254bd7 100644 --- a/modules/ppp_ahdlc.c +++ b/modules/ppp_ahdlc.c @@ -41,7 +41,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id: ppp_ahdlc.c,v 1.15 2000/02/18 10:00:58 masputra Exp $ + * $Id: ppp_ahdlc.c,v 1.16 2000/03/06 19:38:12 masputra Exp $ */ /* @@ -75,6 +75,21 @@ #define USE_MUTEX #endif /* SOL2 */ +/* + * intpointer_t and uintpointer_t are signed and unsigned integer types + * large enough to hold any data pointer; that is, data pointers can be + * assigned into or from these integer types without losing precision. + * On recent Solaris releases, these types are defined in sys/int_types.h, + * but not on SunOS 4.x or the earlier Solaris versions. + */ +#if defined(_LP64) || defined(_I32LPx) +typedef long intpointer_t; +typedef unsigned long uintpointer_t; +#else +typedef int intpointer_t; +typedef unsigned int uintpointer_t; +#endif + MOD_OPEN_DECL(ahdlc_open); MOD_CLOSE_DECL(ahdlc_close); static int ahdlc_wput __P((queue_t *, mblk_t *)); @@ -688,14 +703,6 @@ ahdlc_encode(q, mp) #define IN_RX_MAP(c, m) ((((unsigned int) (uchar_t) (c)) < 0x20) && \ (m) & (1 << (c))) -/* - * SunOS 4.x does not have intptr_t or uintptr_t defined, so - * declare them here - */ -#if defined(SUNOS4) -typedef int intptr_t; -typedef unsigned int uintptr_t; -#endif /* SUNOS4 */ /* * Process received characters. @@ -719,7 +726,7 @@ ahdlc_decode(q, mp) * data upstream in one message block, concatenate everything */ if (!((mp->b_wptr - mp->b_rptr == msgdsize(mp)) && - ((intptr_t)mp->b_rptr % sizeof(intptr_t) == 0))) { + ((intpointer_t)mp->b_rptr % sizeof(intpointer_t) == 0))) { zmp = msgpullup(mp, -1); freemsg(mp); |