From ff0545c9666d3f76db2ab1da1cf5073cf1ecfc45 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 22 Feb 2012 17:10:22 -0500
Subject: [PATCH] Revert "Rename uuid.h wrapper to lttng-ust-uuid.h"

This reverts commit f194f3b00d042154c35f1f9ec262e25f2cd83b8a.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 liblttng-ust/Makefile.am                  | 2 +-
 liblttng-ust/clock.h                      | 2 +-
 liblttng-ust/ltt-events.c                 | 2 +-
 liblttng-ust/ltt-ring-buffer-client.h     | 2 +-
 liblttng-ust/{lttng-ust-uuid.h => uuid.h} | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename liblttng-ust/{lttng-ust-uuid.h => uuid.h} (100%)

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index 75a2ba8a..628e56fb 100644
--- a/liblttng-ust/Makefile.am
+++ b/liblttng-ust/Makefile.am
@@ -34,7 +34,7 @@ liblttng_ust_runtime_la_SOURCES = \
 	wait.h \
 	jhash.h \
 	error.h \
-	lttng-ust-uuid.h
+	uuid.h
 
 liblttng_ust_support_la_SOURCES = \
 	ltt-tracer.h \
diff --git a/liblttng-ust/clock.h b/liblttng-ust/clock.h
index 1523be09..b4d17e78 100644
--- a/liblttng-ust/clock.h
+++ b/liblttng-ust/clock.h
@@ -25,7 +25,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <stdio.h>
-#include "lttng-ust-uuid.h"
+#include "uuid.h"
 
 /* TRACE CLOCK */
 
diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index 40cf3f91..b79eea51 100644
--- a/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@ -35,7 +35,7 @@
 #include <helper.h>
 #include "error.h"
 #include "compat.h"
-#include "lttng-ust-uuid.h"
+#include "uuid.h"
 
 #include "tracepoint-internal.h"
 #include "ltt-tracer.h"
diff --git a/liblttng-ust/ltt-ring-buffer-client.h b/liblttng-ust/ltt-ring-buffer-client.h
index cedbc31d..825db712 100644
--- a/liblttng-ust/ltt-ring-buffer-client.h
+++ b/liblttng-ust/ltt-ring-buffer-client.h
@@ -12,7 +12,7 @@
 #include <lttng/ust-events.h>
 #include "lttng/bitfield.h"
 #include "clock.h"
-#include "lttng-ust-uuid.h"
+#include "uuid.h"
 #include "ltt-tracer.h"
 #include "../libringbuffer/frontend_types.h"
 
diff --git a/liblttng-ust/lttng-ust-uuid.h b/liblttng-ust/uuid.h
similarity index 100%
rename from liblttng-ust/lttng-ust-uuid.h
rename to liblttng-ust/uuid.h
-- 
2.34.1