Move lttng/config.h to lttng/ust-config.h, and use LTTNG_UST_ namespace

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/configure.ac b/configure.ac
index e0ed0b79d380087710cb48058f32944f577cebbc..77ba54afc22503dd26fd4996f193f7949a5e2e0f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,9 +18,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_SRCDIR([include/lttng/tracepoint.h])
 
 # Configuration options, which will be installed in the config.h
-AC_CONFIG_HEADERS([config.h include/lttng/config.h])
-AH_TEMPLATE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.])
-AH_TEMPLATE([HAVE_SDT_INTEGRATION], [DTrace/GDB/SystemTap integration via sdt.h])
+AC_CONFIG_HEADERS([config.h include/lttng/ust-config.h])
+AH_TEMPLATE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.])
+AH_TEMPLATE([LTTNG_UST_HAVE_SDT_INTEGRATION], [DTrace/GDB/SystemTap integration via sdt.h])
 
 # Compute minor/major/patchlevel version numbers
 AC_PROG_SED
@@ -172,7 +172,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 ])
 fi
 if test x$NO_UNALIGNED_ACCESS = x ; then
-AC_DEFINE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [1])
+AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1])
 fi
 
 # Set compile flags to java include files if given
@@ -218,7 +218,7 @@ AC_ARG_WITH([sdt],
 
 AS_IF([test "x$with_sdt" = "xyes"],[
        AC_CHECK_HEADERS([sys/sdt.h], [
-               AC_DEFINE([HAVE_SDT_INTEGRATION], [1])
+               AC_DEFINE([LTTNG_UST_HAVE_SDT_INTEGRATION], [1])
        ],[
                AC_MSG_ERROR([The sdt.h integration was requested
 but this header file cannot be found. Make sure it is installed

diff --git a/include/Makefile.am b/include/Makefile.am
index efaffc85ac913cd7fa478ff5b889defa69e1b403..e339b32e74d11e85823580478136282928c618cb 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -11,7 +11,7 @@ nobase_include_HEADERS = \
        lttng/ust-abi.h \
        lttng/ringbuffer-abi.h \
        lttng/ust-tracer.h \
-       lttng/config.h \
+       lttng/ust-config.h \
        lttng/ust.h \
        lttng/ringbuffer-config.h \
        lttng/align.h \

diff --git a/include/lttng/config.h.in b/include/lttng/config.h.in
deleted file mode 100644 (file)
index c87b97e..0000000
--- a/include/lttng/config.h.in
+++ /dev/null
@@ -1,7 +0,0 @@
-/* ust/config.h.in. Manually generated for control over the contained defs. */
-
-/* Use efficient unaligned access. */
-#undef HAVE_EFFICIENT_UNALIGNED_ACCESS
-
-/* DTrace/GDB/SystemTap integration via sdt.h */
-#undef HAVE_SDT_INTEGRATION

diff --git a/include/lttng/ust-config.h.in b/include/lttng/ust-config.h.in
new file mode 100644 (file)
index 0000000..5d1ee40
--- /dev/null
+++ b/include/lttng/ust-config.h.in
@@ -0,0 +1,7 @@
+/* ust/config.h.in. Manually generated for control over the contained defs. */
+
+/* Use efficient unaligned access. */
+#undef LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS
+
+/* DTrace/GDB/SystemTap integration via sdt.h */
+#undef LTTNG_UST_HAVE_SDT_INTEGRATION

diff --git a/include/lttng/ust-tracer.h b/include/lttng/ust-tracer.h
index dafb69349caead11160faafd82069a12662f4be0..205af942c50ca456a2f211e6b481a1995dfb2a99 100644 (file)
--- a/include/lttng/ust-tracer.h
+++ b/include/lttng/ust-tracer.h
@@ -16,10 +16,10 @@
  * modified is included with the above copyright notice.
  */
 
-#include <lttng/config.h>
+#include <lttng/ust-config.h>
 #include <lttng/ust-version.h>
 
-#ifndef HAVE_EFFICIENT_UNALIGNED_ACCESS
+#ifndef LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS
 /* Align data on its natural alignment */
 #define RING_BUFFER_ALIGN
 #endif