X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libcounter%2Fshm.h;h=8ec251d7686908c544470ad81a577c98d3586bc3;hb=f1324c1158b8ad5b9dd8bcc55e2a1a26ab2113ae;hp=b162e98f292f4eee98f3625b6451e145dca425fe;hpb=864a1eda22ed99266509ac76451c6f27f91aa17e;p=lttng-ust.git

diff --git a/libcounter/shm.h b/libcounter/shm.h
index b162e98f..8ec251d7 100644
--- a/libcounter/shm.h
+++ b/libcounter/shm.h
@@ -13,7 +13,6 @@
 #include <usterr-signal-safe.h>
 #include <urcu/compiler.h>
 #include "shm_types.h"
-#include "ust-helper.h"
 
 /* lttng_counter_handle_create - for UST. */
 extern
@@ -24,8 +23,9 @@ extern
 int lttng_counter_handle_add_cpu(struct lttng_counter_shm_handle *handle,
 		int shm_fd, uint32_t cpu_nr,
 		uint64_t memory_map_size);
-LTTNG_HIDDEN
-unsigned int lttng_counter_handle_get_nr_cpus(struct lttng_counter_shm_handle *handle);
+
+unsigned int lttng_counter_handle_get_nr_cpus(struct lttng_counter_shm_handle *handle)
+	__attribute__((visibility("hidden")));
 
 /*
  * Pointer dereferencing. We don't trust the shm_ref, so we validate
@@ -73,23 +73,27 @@ void _lttng_counter_set_shmp(struct lttng_counter_shm_ref *ref, struct lttng_cou
 
 #define lttng_counter_set_shmp(ref, src)	_lttng_counter_set_shmp(&(ref)._ref, src)
 
-LTTNG_HIDDEN
-struct lttng_counter_shm_object_table *lttng_counter_shm_object_table_create(size_t max_nb_obj);
-LTTNG_HIDDEN
+struct lttng_counter_shm_object_table *lttng_counter_shm_object_table_create(size_t max_nb_obj)
+	__attribute__((visibility("hidden")));
+
 struct lttng_counter_shm_object *lttng_counter_shm_object_table_alloc(struct lttng_counter_shm_object_table *table,
 			size_t memory_map_size,
 			enum lttng_counter_shm_object_type type,
 			const int cpu_fd,
-			int cpu);
-LTTNG_HIDDEN
+			int cpu)
+	__attribute__((visibility("hidden")));
+
 struct lttng_counter_shm_object *lttng_counter_shm_object_table_append_shm(struct lttng_counter_shm_object_table *table,
-			int shm_fd, size_t memory_map_size);
+			int shm_fd, size_t memory_map_size)
+	__attribute__((visibility("hidden")));
+
 /* mem ownership is passed to lttng_counter_shm_object_table_append_mem(). */
-LTTNG_HIDDEN
 struct lttng_counter_shm_object *lttng_counter_shm_object_table_append_mem(struct lttng_counter_shm_object_table *table,
-			void *mem, size_t memory_map_size);
-LTTNG_HIDDEN
-void lttng_counter_shm_object_table_destroy(struct lttng_counter_shm_object_table *table, int consumer);
+			void *mem, size_t memory_map_size)
+	__attribute__((visibility("hidden")));
+
+void lttng_counter_shm_object_table_destroy(struct lttng_counter_shm_object_table *table, int consumer)
+	__attribute__((visibility("hidden")));
 
 /*
  * lttng_counter_zalloc_shm - allocate memory within a shm object.
@@ -98,10 +102,11 @@ void lttng_counter_shm_object_table_destroy(struct lttng_counter_shm_object_tabl
  * *NOT* multithread-safe (should be protected by mutex).
  * Returns a -1, -1 tuple on error.
  */
-LTTNG_HIDDEN
-struct lttng_counter_shm_ref lttng_counter_zalloc_shm(struct lttng_counter_shm_object *obj, size_t len);
-LTTNG_HIDDEN
-void lttng_counter_align_shm(struct lttng_counter_shm_object *obj, size_t align);
+struct lttng_counter_shm_ref lttng_counter_zalloc_shm(struct lttng_counter_shm_object *obj, size_t len)
+	__attribute__((visibility("hidden")));
+
+void lttng_counter_align_shm(struct lttng_counter_shm_object *obj, size_t align)
+	__attribute__((visibility("hidden")));
 
 static inline
 int lttng_counter_shm_get_shm_fd(struct lttng_counter_shm_handle *handle, struct lttng_counter_shm_ref *ref)