Merge remote branch 'netafp/master' into branch-allea

[netatalk.git] / include / atalk / adouble.h

diff --git a/include/atalk/adouble.h b/include/atalk/adouble.h
index 5de2b4ebf169fdf6c7794943352e5bbf1408832c..963417bd32b16ff6e4569c3c4b034dc693e21ba0 100644 (file)
--- a/include/atalk/adouble.h
+++ b/include/atalk/adouble.h
@@ -146,8 +146,8 @@
 typedef uint32_t cnid_t;
 
 struct ad_entry {
-    uint32_t   ade_off;
-    uint32_t   ade_len;
+    off_t     ade_off;
+    ssize_t   ade_len;
 };
 
 typedef struct adf_lock_t {
@@ -241,8 +241,12 @@ struct adouble {
 /* synchronization locks */
 #define AD_FILELOCK_BASE (0x80000000)
 #else
+#if _FILE_OFFSET_BITS == 64
+#define AD_FILELOCK_BASE (0x7FFFFFFFFFFFFFFFULL - 9)
+#else
 #define AD_FILELOCK_BASE (0x7FFFFFFF -9)
 #endif
+#endif
 
 /* FIXME:
  * AD_FILELOCK_BASE case