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

diff --git a/libcounter/shm.h b/libcounter/shm.h
index b162e98f..7be88605 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,7 +23,8 @@ 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
+
+__attribute__((visibility("hidden")))
 unsigned int lttng_counter_handle_get_nr_cpus(struct lttng_counter_shm_handle *handle);
 
 /*
@@ -73,22 +73,26 @@ 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
+__attribute__((visibility("hidden")))
 struct lttng_counter_shm_object_table *lttng_counter_shm_object_table_create(size_t max_nb_obj);
-LTTNG_HIDDEN
+
+__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
+
+__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);
+
 /* mem ownership is passed to lttng_counter_shm_object_table_append_mem(). */
-LTTNG_HIDDEN
+__attribute__((visibility("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
+
+__attribute__((visibility("hidden")))
 void lttng_counter_shm_object_table_destroy(struct lttng_counter_shm_object_table *table, int consumer);
 
 /*
@@ -98,9 +102,10 @@ 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
+__attribute__((visibility("hidden")))
 struct lttng_counter_shm_ref lttng_counter_zalloc_shm(struct lttng_counter_shm_object *obj, size_t len);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 void lttng_counter_align_shm(struct lttng_counter_shm_object *obj, size_t align);
 
 static inline