From f259c81b5a19f56b0d90bdcb26d8ea8b4b5a1476 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 21 Feb 2012 10:01:15 -0500
Subject: [PATCH] Rename uuid.h wrapper to lttng-ust-uuid.h

commit eda498b8b8e095ff45eb4906413994987ead66ec upstream.

So it does not clash with BSD system's uuid.h

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Christian Babeux <christian.babeux@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/{uuid.h => lttng-ust-uuid.h} | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename liblttng-ust/{uuid.h => lttng-ust-uuid.h} (100%)

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index 16070d59..e68953a3 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 \
-	uuid.h
+	lttng-ust-uuid.h
 
 liblttng_ust_support_la_SOURCES = \
 	ltt-tracer.h \
diff --git a/liblttng-ust/clock.h b/liblttng-ust/clock.h
index b4d17e78..1523be09 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 "uuid.h"
+#include "lttng-ust-uuid.h"
 
 /* TRACE CLOCK */
 
diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index 627acfec..2b9037ef 100644
--- a/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@ -47,7 +47,7 @@
 #include <helper.h>
 #include "error.h"
 #include "compat.h"
-#include "uuid.h"
+#include "lttng-ust-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 7b6827ff..f18b4ed3 100644
--- a/liblttng-ust/ltt-ring-buffer-client.h
+++ b/liblttng-ust/ltt-ring-buffer-client.h
@@ -24,7 +24,7 @@
 #include <lttng/ust-events.h>
 #include "lttng/bitfield.h"
 #include "clock.h"
-#include "uuid.h"
+#include "lttng-ust-uuid.h"
 #include "ltt-tracer.h"
 #include "../libringbuffer/frontend_types.h"
 
diff --git a/liblttng-ust/uuid.h b/liblttng-ust/lttng-ust-uuid.h
similarity index 100%
rename from liblttng-ust/uuid.h
rename to liblttng-ust/lttng-ust-uuid.h
-- 
2.34.1