From eda498b8b8e095ff45eb4906413994987ead66ec Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 21 Feb 2012 10:01:15 -0500 Subject: [PATCH] Rename uuid.h wrapper to lttng-ust-uuid.h So it does not clash with BSD system's uuid.h Signed-off-by: Mathieu Desnoyers --- 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 628e56fb..75a2ba8a 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 #include #include -#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 b79eea51..40cf3f91 100644 --- a/liblttng-ust/ltt-events.c +++ b/liblttng-ust/ltt-events.c @@ -35,7 +35,7 @@ #include #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 825db712..cedbc31d 100644 --- a/liblttng-ust/ltt-ring-buffer-client.h +++ b/liblttng-ust/ltt-ring-buffer-client.h @@ -12,7 +12,7 @@ #include #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