Merge from branch-2-1

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

diff --git a/include/atalk/uuid.h b/include/atalk/uuid.h
index 25db56ec940217a78b14006362ae284a73e87337..7c28603a6c0f573e96506383f40668ba6b15cd0a 100644 (file)
--- a/include/atalk/uuid.h
+++ b/include/atalk/uuid.h
@@ -20,7 +20,7 @@
 #define UUID_STRINGSIZE 36
 
 typedef char *uuidp_t;
-typedef char uuid_t[UUID_BINSIZE];
+typedef char atalk_uuid_t[UUID_BINSIZE];
 
 typedef enum {UUID_USER = 1, UUID_GROUP} uuidtype_t;
 extern char *uuidtype[];