X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-uuid.h;h=3b05d178e02a7f2bd1b0fff9754cf06c92932261;hb=218deb69baab57ee2f6728eef18e84697f21197b;hp=765e8d1346c2be0da103cc8e734c9704859cefa1;hpb=d2428e875af8666473fb689429eaf1022862510d;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-uuid.h b/liblttng-ust/lttng-ust-uuid.h
index 765e8d13..3b05d178 100644
--- a/liblttng-ust/lttng-ust-uuid.h
+++ b/liblttng-ust/lttng-ust-uuid.h
@@ -23,41 +23,7 @@
  * SOFTWARE.
  */
 
-#include <config.h>
 #include <lttng/ust-events.h> /* For LTTNG_UST_UUID_LEN */
-/*
- * Includes final \0.
- */
-#define LTTNG_UST_UUID_STR_LEN		37
-
-#ifdef LTTNG_UST_HAVE_LIBUUID
-#include <uuid/uuid.h>
-
-static inline
-int lttng_ust_uuid_generate(unsigned char *uuid_out)
-{
-	uuid_generate(uuid_out);
-	return 0;
-}
-
-#elif defined(LTTNG_UST_HAVE_LIBC_UUID)
-#include <uuid.h>
-#include <stdint.h>
-
-static inline
-int lttng_ust_uuid_generate(unsigned char *uuid_out)
-{
-	uint32_t status;
-
-	uuid_create((uuid_t *) uuid_out, &status);
-	if (status == uuid_s_ok)
-		return 0;
-	else
-		return -1;
-}
-
-#else
-#error "LTTng-UST needs to have a UUID generator configured."
-#endif
+#include <lttng/ust-clock.h>
 
 #endif /* _LTTNG_UST_UUID_H */