xnu-4570.61.1.tar.gz

[apple/xnu.git] / bsd / uuid / uuid.h

diff --git a/bsd/uuid/uuid.h b/bsd/uuid/uuid.h
index 3d172d2f6c5e4b9e44957187312c0658e8a76940..65524909a2112bae2e96696a272da14f5187d6a1 100644 (file)
--- a/bsd/uuid/uuid.h
+++ b/bsd/uuid/uuid.h
@@ -36,15 +36,18 @@
 #define _UUID_UUID_H
 
 #include <sys/_types.h>
+#include <sys/_types/_uuid_t.h>
 
-#ifndef _UUID_T
-#define _UUID_T
-typedef __darwin_uuid_t        uuid_t;
-#endif /* _UUID_T */
+#ifndef _UUID_STRING_T
+#define _UUID_STRING_T
+typedef __darwin_uuid_string_t uuid_string_t;
+#endif /* _UUID_STRING_T */
 
 #define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \
        static const uuid_t name __attribute__ ((unused)) = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15}
 
+UUID_DEFINE(UUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -61,11 +64,11 @@ void uuid_generate_time(uuid_t out);
 
 int uuid_is_null(const uuid_t uu);
 
-int uuid_parse(const char *in, uuid_t uu);
+int uuid_parse(const uuid_string_t in, uuid_t uu);
 
-void uuid_unparse(const uuid_t uu, char *out);
-void uuid_unparse_lower(const uuid_t uu, char *out);
-void uuid_unparse_upper(const uuid_t uu, char *out);
+void uuid_unparse(const uuid_t uu, uuid_string_t out);
+void uuid_unparse_lower(const uuid_t uu, uuid_string_t out);
+void uuid_unparse_upper(const uuid_t uu, uuid_string_t out);
 
 #ifdef __cplusplus
 }