Merge master

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

diff --git a/include/atalk/directory.h b/include/atalk/directory.h
index 8fb331559a667f3c2804ee524b898fe5caf874f5..e474faf59fec95c9b1bdc27e81edaa767a1e54ad 100644 (file)
--- a/include/atalk/directory.h
+++ b/include/atalk/directory.h
@@ -24,9 +24,8 @@
 #ifndef ATALK_DIRECTORY_H
 #define ATALK_DIRECTORY_H 1
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
-#include <netatalk/endian.h>
+#include <arpa/inet.h>
 #include <dirent.h>
 #include <stdint.h>
 
@@ -72,6 +71,8 @@ struct dir {
     uint32_t    d_offcnt;             /* offspring count */
     uint16_t    d_vid;                /* only needed in the dircache, because
                                          we put all directories in one cache. */
+    uint32_t    d_rights_cache;       /* cached rights combinded from mode and possible ACL */
+
     /* Stuff used in the dircache */
     time_t      dcache_ctime;         /* inode ctime, used and modified by dircache */
     ino_t       dcache_ino;           /* inode number, used to detect changes in the dircache */