X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-tracer.h;h=cc5f93e4f7bb31cd6ee9a08f4c874d3ac73af80b;hb=4e48b5d;hp=acc475bfe1dde65bb16a239652b359568da6448c;hpb=eae3c72949135b48639440468dc78ea1d5e937e9;p=lttng-ust.git

diff --git a/include/lttng/ust-tracer.h b/include/lttng/ust-tracer.h
index acc475bf..cc5f93e4 100644
--- a/include/lttng/ust-tracer.h
+++ b/include/lttng/ust-tracer.h
@@ -9,27 +9,32 @@
 #ifndef _LTTNG_UST_TRACER_H
 #define _LTTNG_UST_TRACER_H
 
-#include <limits.h>
-
 #include <lttng/ust-arch.h>
 #include <lttng/ust-compiler.h>
-#include <lttng/ust-config.h>
 #include <lttng/ust-utils.h>
 #include <lttng/ust-version.h>
 
+/*
+ * Default to having the content of the ringbuffer respect the natural
+ * alignment of the system. Only pack its content on architectures we know
+ * have efficient unaligned memory access.
+ */
 #ifndef LTTNG_UST_ARCH_HAS_EFFICIENT_UNALIGNED_ACCESS
-/* Align data on its natural alignment */
-#define RING_BUFFER_ALIGN
-#endif
-
-#ifndef CHAR_BIT
-#define CHAR_BIT 8
+#define LTTNG_UST_RING_BUFFER_NATURAL_ALIGN
 #endif
 
-#ifdef RING_BUFFER_ALIGN
-#define lttng_alignof(type)	__alignof__(type)
+#ifdef LTTNG_UST_RING_BUFFER_NATURAL_ALIGN
+#define lttng_ust_rb_alignof(type)	__alignof__(type)
 #else
-#define lttng_alignof(type)	1
+#define lttng_ust_rb_alignof(type)	1
 #endif
 
+/*
+ * Concatenate lttng ust shared libraries name with their major version number.
+ */
+#define LTTNG_UST_LIB_SONAME "liblttng-ust.so." lttng_ust_stringify(LTTNG_UST_LIB_SONAME_MAJOR)
+#define LTTNG_UST_TRACEPOINT_LIB_SONAME "liblttng-ust-tracepoint.so." lttng_ust_stringify(LTTNG_UST_LIB_SONAME_MAJOR)
+#define LTTNG_UST_CTL_LIB_SONAME "liblttng-ust-ctl.so." lttng_ust_stringify(LTTNG_UST_CTL_LIB_SONAME_MAJOR)
+
+
 #endif /* _LTTNG_UST_TRACER_H */