xnu-7195.101.1.tar.gz

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

diff --git a/bsd/uuid/uuid.h b/bsd/uuid/uuid.h
index be1f90fe2d6dec0bf0304e6fb2ed350d242f1493..28f231f8b4f54963d5cabb40eab84b577809da1d 100644 (file)
--- a/bsd/uuid/uuid.h
+++ b/bsd/uuid/uuid.h
@@ -1,6 +1,6 @@
 /*
  * Public include file for the UUID library
- * 
+ *
  * Copyright (C) 1996, 1997, 1998 Theodore Ts'o.
  *
  * %Begin-Header%
@@ -16,7 +16,7 @@
  * 3. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior
  *    written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
@@ -36,20 +36,18 @@
 #define _UUID_UUID_H
 
 #include <sys/_types.h>
-
-#ifndef _UUID_T
-#define _UUID_T
-typedef __darwin_uuid_t        uuid_t;
-#endif /* _UUID_T */
+#include <sys/_types/_uuid_t.h>
 
 #ifndef _UUID_STRING_T
 #define _UUID_STRING_T
-typedef __darwin_uuid_string_t 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) \
+#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
@@ -64,6 +62,8 @@ void uuid_generate(uuid_t out);
 void uuid_generate_random(uuid_t out);
 void uuid_generate_time(uuid_t out);
 
+void uuid_generate_early_random(uuid_t out);
+
 int uuid_is_null(const uuid_t uu);
 
 int uuid_parse(const uuid_string_t in, uuid_t uu);