Libc-825.24.tar.gz

[apple/libc.git] / sys / statx_np.c

diff --git a/sys/statx_np.c b/sys/statx_np.c
index 3159378c166227d4671c621bfd1c63022b5aef41..3b2d9fb4b26f653ed969747f6d4e4e5af2076319 100644 (file)
--- a/sys/statx_np.c
+++ b/sys/statx_np.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#define ACL_MIN_SIZE_HEURISTIC (sizeof(struct kauth_filesec) + 16 * sizeof(struct kauth_ace))
+#define ACL_MIN_SIZE_HEURISTIC (KAUTH_FILESEC_SIZE(16))
 
 static int     statx_syscall(void *obj, void  *sbptr, void *fsacl, size_t *fsacl_size);
 static int     fstatx_syscall(void *obj, void  *sbptr, void *fsacl, size_t *fsacl_size);
@@ -69,7 +69,7 @@ lstatx_np(const char *path, struct stat *sb, filesec_t fsec)
 }
 
 
-#if __DARWIN_64_BIT_INO_T
+#if __DARWIN_64_BIT_INO_T && !__DARWIN_ONLY_64_BIT_INO_T
 int
 statx64_np(const char *path, struct stat64 *sb, filesec_t fsec)
 {
@@ -87,7 +87,7 @@ lstatx64_np(const char *path, struct stat64 *sb, filesec_t fsec)
 {
        return(lstatx_np(path, (struct stat *)sb, fsec));
 }
-#endif /* __DARWIN_64_BIT_INO_T */
+#endif /* __DARWIN_64_BIT_INO_T && !__DARWIN_ONLY_64_BIT_INO_T */
 
 /*
  * Stat syscalls
@@ -143,7 +143,7 @@ statx1(void *obj,
     int (* stat_syscall)(void *obj, void *sbptr, void *fsacl, size_t *fsacl_size),
     void  *sbptr, filesec_t fsec)
 {
-       struct kauth_filesec *fsacl, *ofsacl;
+       kauth_filesec_t fsacl, ofsacl;
        size_t fsacl_size, buffer_size;
        int error;
        struct stat * sb = (struct stat *)0;