X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=nfs%2Flibnfs-raw-nfs.h;h=a3b60f566d52bdd8e26b6a1dede106fd8a0d6c77;hb=HEAD;hp=8837d3dcf946b36cdf4542ea78bb5afdaa0c886a;hpb=af8d37c8b703f3dc22d3ff1c7578b16e84c25050;p=deb_libnfs.git

diff --git a/nfs/libnfs-raw-nfs.h b/nfs/libnfs-raw-nfs.h
index 8837d3d..a3b60f5 100644
--- a/nfs/libnfs-raw-nfs.h
+++ b/nfs/libnfs-raw-nfs.h
@@ -36,7 +36,7 @@ either expressed or implied, of the FreeBSD Project.
 #define _NFS_H_RPCGEN
 #include <nfsc/libnfs-zdr.h>
 
-
+#include <nfsc/libnfs-zdr.h>
 
 
 #ifdef __cplusplus
@@ -48,18 +48,11 @@ extern "C" {
 #define NFS3_CREATEVERFSIZE 8
 #define NFS3_COOKIEVERFSIZE 8
 
-#if defined(ANDROID)
-typedef long long int quad_t;
-typedef long long unsigned u_quad_t;
-#endif
-#if defined(WIN32)
-typedef long long int quad_t;
-typedef long long unsigned u_quad_t;
-#endif
+
 
 typedef char cookieverf3[NFS3_COOKIEVERFSIZE];
 
-typedef u_quad_t cookie3;
+typedef uint64_t cookie3;
 
 struct nfs_fh3 {
 	struct {
@@ -94,9 +87,9 @@ typedef u_int uid3;
 
 typedef u_int gid3;
 
-typedef u_quad_t size3;
+typedef uint64_t size3;
 
-typedef u_quad_t fileid3;
+typedef uint64_t fileid3;
 
 struct specdata3 {
 	u_int specdata1;
@@ -119,7 +112,7 @@ struct fattr3 {
 	size3 size;
 	size3 used;
 	specdata3 rdev;
-	u_quad_t fsid;
+	uint64_t fsid;
 	fileid3 fileid;
 	nfstime3 atime;
 	nfstime3 mtime;
@@ -175,7 +168,7 @@ enum stable_how {
 };
 typedef enum stable_how stable_how;
 
-typedef u_quad_t offset3;
+typedef uint64_t offset3;
 
 typedef u_int count3;