X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fnfs%2Flibnfs-raw.h;h=e61d17ec6b6ecc1c5e4771762cc676d23997422e;hb=51a56b52627e635566253a3fae081c3f466b6bb6;hp=c4589cb5a1b0708da80fd4c64ae25860750190b1;hpb=f91748e6a99dfd3b6565aed4e98e84b4365eb9c2;p=ccan

diff --git a/ccan/nfs/libnfs-raw.h b/ccan/nfs/libnfs-raw.h
index c4589cb5..e61d17ec 100644
--- a/ccan/nfs/libnfs-raw.h
+++ b/ccan/nfs/libnfs-raw.h
@@ -1,4 +1,6 @@
-/* 
+#ifndef CCAN_NFS_LIBNFS_RAW_H
+#define CCAN_NFS_LIBNFS_RAW_H
+/*
    Copyright (C) by Ronnie Sahlberg <ronniesahlberg@gmail.com> 2010
    
    This program is free software; you can redistribute it and/or modify
@@ -69,7 +71,7 @@ int rpc_disconnect(struct rpc_context *rpc, char *error);
 void rpc_set_error(struct rpc_context *rpc, char *error_string, ...);
 
 
-/* 
+/*
  * PORTMAP FUNCTIONS
  */
 
@@ -108,7 +110,7 @@ int rpc_pmap_getport_async(struct rpc_context *rpc, int program, int version, rp
 
 
 
-/* 
+/*
  * MOUNT FUNCTIONS
  */
 char *mountstat3_to_str(int stat);
@@ -213,7 +215,7 @@ int rpc_mount_export_async(struct rpc_context *rpc, rpc_cb cb, void *private_dat
 
 
 
-/* 
+/*
  * NFS FUNCTIONS
  */
 struct nfs_fh3;
@@ -298,7 +300,7 @@ int rpc_nfs_access_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh,
  * RPC_STATUS_CANCEL : The connection attempt was aborted before it could complete.
  *                     data is NULL.
  */
-int rpc_nfs_read_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh, off_t offset, size_t count, void *private_data);
+int rpc_nfs_read_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh, nfs_off_t offset, size_t count, void *private_data);
 
 /*
  * Call NFS/WRITE
@@ -314,7 +316,7 @@ int rpc_nfs_read_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh, o
  * RPC_STATUS_CANCEL : The connection attempt was aborted before it could complete.
  *                     data is NULL.
  */
-int rpc_nfs_write_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh, char *buf, off_t offset, size_t count, int stable_how, void *private_data);
+int rpc_nfs_write_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh, char *buf, nfs_off_t offset, size_t count, int stable_how, void *private_data);
 
 /*
  * Call NFS/COMMIT
@@ -538,7 +540,7 @@ int rpc_nfs_link_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *file,
 
 
 
-/* 
+/*
  * NFSACL FUNCTIONS
  */
 /*
@@ -557,3 +559,4 @@ int rpc_nfs_link_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *file,
  */
 int rpc_nfsacl_null_async(struct rpc_context *rpc, rpc_cb cb, void *private_data);
 
+#endif /* CCAN_NFS_LIBNFS_RAW_H */