diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-04-23 00:20:40 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-04-23 00:20:40 -0700 |
| commit | ed85e20e4d6a27d5405f37366dd34b64c10a9211 (patch) | |
| tree | 1dd34201f8777a4aba0ecbc39e8f480ba1407c41 /parsenfsfh.c | |
| parent | 595f1b5414c37b6ba31ed876343fd278a4c058ca (diff) | |
| download | tcpdump-ed85e20e4d6a27d5405f37366dd34b64c10a9211.tar.gz | |
u_intN_t is dead, long live uintN_t.
And, as we require at least autoconf 2.61, and as autoconf 2.61 and
later have AC_TYPE_UINTn_T and AC_TYPE_INTn_T macros, we use them to
define the uintN_t and intN_t macros if the system doesn't define them
for us.
This lets us get rid of bitypes.h as well.
Diffstat (limited to 'parsenfsfh.c')
| -rw-r--r-- | parsenfsfh.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/parsenfsfh.c b/parsenfsfh.c index a86a4316..826ca94e 100644 --- a/parsenfsfh.c +++ b/parsenfsfh.c @@ -79,7 +79,7 @@ #ifdef ultrix /* Nasty hack to keep the Ultrix C compiler from emitting bogus warnings */ -#define XFF(x) ((u_int32_t)(x)) +#define XFF(x) ((uint32_t)(x)) #else #define XFF(x) (x) #endif @@ -107,13 +107,13 @@ static int is_UCX(const unsigned char *); void Parse_fh(register const unsigned char *fh, int len _U_, my_fsid *fsidp, - u_int32_t *inop, + uint32_t *inop, const char **osnamep, /* if non-NULL, return OS name here */ const char **fsnamep, /* if non-NULL, return server fs name here (for VMS) */ int ourself) /* true if file handle was generated on this host */ { register const unsigned char *fhp = fh; - u_int32_t temp; + uint32_t temp; int fhtype = FHT_UNKNOWN; int i; @@ -364,7 +364,7 @@ Parse_fh(register const unsigned char *fh, int len _U_, my_fsid *fsidp, memcpy((char *)fsidp, (char *)fh, 14); } else { - u_int32_t tempa[4]; /* at least 16 bytes, maybe more */ + uint32_t tempa[4]; /* at least 16 bytes, maybe more */ memset((char *)tempa, 0, sizeof(tempa)); memcpy((char *)tempa, (char *)fh, 14); /* ensure alignment */ |