From 562c813acc6247c3c749841f4e4f812e7cedb66a Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 10 Feb 2012 17:55:03 -0500 Subject: [PATCH] Move lttng/config.h to lttng/ust-config.h, and use LTTNG_UST_ namespace Signed-off-by: Mathieu Desnoyers --- configure.ac | 10 +++++----- include/Makefile.am | 2 +- include/lttng/{config.h.in => ust-config.h.in} | 4 ++-- include/lttng/ust-tracer.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) rename include/lttng/{config.h.in => ust-config.h.in} (65%) diff --git a/configure.ac b/configure.ac index e0ed0b79..77ba54af 100644 --- 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 efaffc85..e339b32e 100644 --- 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/ust-config.h.in similarity index 65% rename from include/lttng/config.h.in rename to include/lttng/ust-config.h.in index c87b97eb..5d1ee408 100644 --- a/include/lttng/config.h.in +++ b/include/lttng/ust-config.h.in @@ -1,7 +1,7 @@ /* ust/config.h.in. Manually generated for control over the contained defs. */ /* Use efficient unaligned access. */ -#undef HAVE_EFFICIENT_UNALIGNED_ACCESS +#undef LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS /* DTrace/GDB/SystemTap integration via sdt.h */ -#undef HAVE_SDT_INTEGRATION +#undef LTTNG_UST_HAVE_SDT_INTEGRATION diff --git a/include/lttng/ust-tracer.h b/include/lttng/ust-tracer.h index dafb6934..205af942 100644 --- 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 +#include #include -#ifndef HAVE_EFFICIENT_UNALIGNED_ACCESS +#ifndef LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS /* Align data on its natural alignment */ #define RING_BUFFER_ALIGN #endif -- 2.34.1