merge from branch 2-1

[netatalk.git] / etc / afpd / acls.h

diff --git a/etc/afpd/acls.h b/etc/afpd/acls.h
index 4965c56b852a4d8b2876b89d474143a33038a16d..fb0792c3af19e7b3972284b51fc90b26bdabc1a1 100644 (file)
--- a/etc/afpd/acls.h
+++ b/etc/afpd/acls.h
@@ -19,7 +19,7 @@
 #include <sys/acl.h>
 #endif
 
-#include <atalk/uuid.h>                /* for uuid_t */
+#include <atalk/uuid.h>                /* for atalk_uuid_t */
 
 /*
  * This is what Apple says about ACL flags in sys/kauth.h:
@@ -93,7 +93,7 @@ enum {
 
 /* Access Control List Entry (ACE) */
 typedef struct {
-    uuid_t      darwin_ace_uuid;
+    atalk_uuid_t      darwin_ace_uuid;
     uint32_t    darwin_ace_flags;
     uint32_t    darwin_ace_rights;
 } darwin_ace_t;