diff options
| author | deraadt <deraadt@NetBSD.org> | 1994-10-15 07:56:51 +0000 |
|---|---|---|
| committer | deraadt <deraadt@NetBSD.org> | 1994-10-15 07:56:51 +0000 |
| commit | 2343dc8f90d944be1fa3752fbdbdc6eff6adc94e (patch) | |
| tree | f838cef9d2ba8cd90d44123bbf3f43c95bb92f05 /include | |
| parent | 63afb063a5ee22c8e01c500374b2877a29361e20 (diff) | |
u_int_{16,32}_t stuff
Diffstat (limited to 'include')
| -rw-r--r-- | include/arpa/nameser.h | 42 | ||||
| -rw-r--r-- | include/resolv.h | 10 |
2 files changed, 26 insertions, 26 deletions
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h index 3728de15b25..cdc2197f37c 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)nameser.h 5.25 (Berkeley) 4/3/91 - * $Id: nameser.h,v 1.5 1994/04/07 06:59:03 deraadt Exp $ + * $Id: nameser.h,v 1.6 1994/10/15 07:56:55 deraadt Exp $ */ #ifndef _NAMESER_H_ @@ -189,16 +189,16 @@ typedef struct { * Structure for passing resource records around. */ struct rrec { - short r_zone; /* zone number */ - short r_class; /* class number */ - short r_type; /* type number */ - u_long r_ttl; /* time to live */ - int r_size; /* size of data area */ - char *r_data; /* pointer to data */ + int16_t r_zone; /* zone number */ + int16_t r_class; /* class number */ + int16_t r_type; /* type number */ + u_int32_t r_ttl; /* time to live */ + int r_size; /* size of data area */ + char *r_data; /* pointer to data */ }; -extern u_short _getshort(); -extern u_long _getlong(); +extern u_int16_t _getshort(); +extern u_int32_t _getlong(); /* * Inline versions of get/put short/long. @@ -208,26 +208,26 @@ extern u_long _getlong(); */ #define GETSHORT(s, cp) { \ register u_char *t_cp = (u_char *)(cp); \ - (s) = ((u_short)t_cp[0] << 8) \ - | ((u_short)t_cp[1]) ;\ - (cp) += 2; \ + (s) = ((u_int16_t)t_cp[0] << 8) \ + | ((u_int16_t)t_cp[1]) ;\ + (cp) += sizeof(u_int16_t); \ } #define GETLONG(l, cp) { \ register u_char *t_cp = (u_char *)(cp); \ - (l) = ((u_long)t_cp[0] << 24) \ - | ((u_long)t_cp[1] << 16) \ - | ((u_long)t_cp[2] << 8) \ - | ((u_long)t_cp[3]) ;\ - (cp) += 4; \ + (l) = ((u_int32_t)t_cp[0] << 24) \ + | ((u_int32_t)t_cp[1] << 16) \ + | ((u_int32_t)t_cp[2] << 8) \ + | ((u_int32_t)t_cp[3]) ;\ + (cp) += sizeof(u_int32_t); \ } #define PUTSHORT(s, cp) { \ - register u_short t_s = (u_short)(s); \ + register u_int16_t t_s = (u_int16_t)(s); \ register u_char *t_cp = (u_char *)(cp); \ *t_cp++ = t_s >> 8; \ *t_cp = t_s; \ - (cp) += 2; \ + (cp) += sizeof(u_int16_t); \ } /* @@ -235,13 +235,13 @@ extern u_long _getlong(); * were depending on this "feature", you will lose. */ #define PUTLONG(l, cp) { \ - register u_long t_l = (u_long)(l); \ + register u_int32_t t_l = (u_int32_t)(l); \ register u_char *t_cp = (u_char *)(cp); \ *t_cp++ = t_l >> 24; \ *t_cp++ = t_l >> 16; \ *t_cp++ = t_l >> 8; \ *t_cp = t_l; \ - (cp) += 4; \ + (cp) += sizeof(u_int32_t); \ } #endif /* !_NAMESER_H_ */ diff --git a/include/resolv.h b/include/resolv.h index 37eef7c8080..e55653a74f1 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)resolv.h 5.15 (Berkeley) 4/3/91 - * $Id: resolv.h,v 1.5 1994/06/13 01:16:13 jtc Exp $ + * $Id: resolv.h,v 1.6 1994/10/15 07:56:51 deraadt Exp $ */ #ifndef _RESOLV_H_ @@ -86,7 +86,7 @@ struct __res_state { char unused[3]; struct { struct in_addr addr; - u_long mask; + u_int32_t mask; } sort_list[MAXRESOLVSORT]; char lookups[MAXDNSLUS]; }; @@ -145,10 +145,10 @@ __BEGIN_DECLS int __dn_skipname __P((const u_char *, const u_char *)); void __fp_query __P((char *, FILE *)); char *__hostalias __P((const char *)); -void __putlong __P((u_long, u_char *)); -void __putshort __P((u_short, u_char *)); +void __putlong __P((u_int32_t, u_char *)); +void __putshort __P((u_int16_t, u_char *)); char *__p_class __P((int)); -char *__p_time __P((u_long)); +char *__p_time __P((u_int32_t)); char *__p_type __P((int)); int dn_comp __P((const u_char *, u_char *, int, u_char **, u_char **)); |
