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>

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index 16070d592343bcef960156bd1c3c04958dcdc5d8..e68953a3e258313f2390545f31754bd300224835 100644 (file)
--- 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 b4d17e785e164e3ae9a59c89fd7a897853754bc8..1523be09d3a747395f9421d14864fc9e3a597ed3 100644 (file)
--- 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 627acfecc47d2101114e3e991659f75ed9657107..2b9037ef48f0d84b8ca237733f5e3438267bb48d 100644 (file)
--- 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 7b6827ffa1edefca5413e6287a17e2f8375e55f2..f18b4ed387cdf876dffebd4ae41b7a808b57b55d 100644 (file)
--- 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/lttng-ust-uuid.h b/liblttng-ust/lttng-ust-uuid.h
new file mode 100644 (file)
index 0000000..1027acb
--- /dev/null
+++ b/liblttng-ust/lttng-ust-uuid.h
@@ -0,0 +1,54 @@
+#ifndef _LTTNG_UST_UUID_H
+#define _LTTNG_UST_UUID_H
+
+/*
+ * Copyright (C) 2011   Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
+ * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
+ *
+ * Permission is hereby granted to use or copy this program
+ * for any purpose,  provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ */
+
+#include <config.h>
+#include <lttng/ust-events.h> /* For LTTNG_UST_UUID_LEN */
+/*
+ * Includes final \0.
+ */
+#define LTTNG_UST_UUID_STR_LEN         37
+
+#include <uuid/uuid.h>
+
+#ifdef LTTNG_UST_HAVE_LIBUUID
+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_out, &status);
+       if (status == uuid_s_ok)
+               return 0;
+       else
+               return -1;
+}
+
+#else
+#error "LTTng-UST needs to have a UUID generator configured."
+#endif
+
+#endif /* _LTTNG_UST_UUID_H */

diff --git a/liblttng-ust/uuid.h b/liblttng-ust/uuid.h
deleted file mode 100644 (file)
index 1027acb..0000000
--- a/liblttng-ust/uuid.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef _LTTNG_UST_UUID_H
-#define _LTTNG_UST_UUID_H
-
-/*
- * Copyright (C) 2011   Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-
-#include <config.h>
-#include <lttng/ust-events.h> /* For LTTNG_UST_UUID_LEN */
-/*
- * Includes final \0.
- */
-#define LTTNG_UST_UUID_STR_LEN         37
-
-#include <uuid/uuid.h>
-
-#ifdef LTTNG_UST_HAVE_LIBUUID
-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_out, &status);
-       if (status == uuid_s_ok)
-               return 0;
-       else
-               return -1;
-}
-
-#else
-#error "LTTng-UST needs to have a UUID generator configured."
-#endif
-
-#endif /* _LTTNG_UST_UUID_H */