Fix some "unsigned int" vs. "size_t" issues (they're not necessarily the

[tcpdump] / nfs.h

diff --git a/nfs.h b/nfs.h
index 045ebb1e32154ac5bed88429e24abc7373716d2e..a63ee94e193c861c82cfb950baf85fef48057f70 100644 (file)
--- a/nfs.h
+++ b/nfs.h
@@ -1,3 +1,4 @@
+/* @(#) $Header: /tcpdump/master/tcpdump/nfs.h,v 1.7 2002-12-11 07:13:55 guy Exp $ (LBL) */
 /*     $NetBSD: nfs.h,v 1.1 1996/05/23 22:49:53 fvdl Exp $     */
 
 /*
@@ -245,7 +246,7 @@
 
 /* File types */
 typedef enum { NFNON=0, NFREG=1, NFDIR=2, NFBLK=3, NFCHR=4, NFLNK=5,
-       NFSOCK=6, NFFIFO=7 } nfstype;
+       NFSOCK=6, NFFIFO=7 } nfs_type;
 
 /* Structs for common parts of the rpc's */
 /*
@@ -285,15 +286,21 @@ struct nfs_uquad {
 };
 typedef        struct nfs_uquad        nfsuint64;
 
+#if 0 /* XXX - this doesn't seemed to be used and it doesn't work
+       * with non-gcc, so comment it out for now.
+       */
+
 /*
  * Used to convert between two u_longs and a u_quad_t.
  */
 union nfs_quadconvert {
        u_int32_t lval[2];
-       u_quad_t  qval;
+       u_int64_t qval;
 };
 typedef union nfs_quadconvert  nfsquad_t;
 
+#endif
+
 /*
  * NFS Version 3 special file number.
  */