cleanup: function attribute 'constructor'

[lttng-ust.git] / liblttng-ust-libc-wrapper / lttng-ust-malloc.c

diff --git a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
index 694eed172fdedc87fb713198cd0b56019f1ba3e5..f8c7aa8b967c0d8cdb218619b7dd33a3a375ea82 100644 (file)
--- a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
+++ b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
@@ -19,8 +19,8 @@
 #include <urcu/compiler.h>
 #include <urcu/tls-compat.h>
 #include <urcu/arch.h>
-#include <lttng/align.h>
 #include <ust-helper.h>
+#include "ust-compat.h"
 
 #define TRACEPOINT_DEFINE
 #define TRACEPOINT_CREATE_PROBES
@@ -56,7 +56,10 @@ void *static_calloc(size_t nmemb, size_t size);
  */
 static int ust_malloc_lock;
 
-static __attribute__((unused))
+static
+void ust_malloc_spin_lock(pthread_mutex_t *lock)
+       __attribute__((unused));
+static
 void ust_malloc_spin_lock(pthread_mutex_t *lock)
 {
        /*
@@ -68,7 +71,10 @@ void ust_malloc_spin_lock(pthread_mutex_t *lock)
                caa_cpu_relax();
 }
 
-static __attribute__((unused))
+static
+void ust_malloc_spin_unlock(pthread_mutex_t *lock)
+       __attribute__((unused));
+static
 void ust_malloc_spin_unlock(pthread_mutex_t *lock)
 {
        /*
@@ -414,8 +420,7 @@ void lttng_ust_fixup_malloc_nesting_tls(void)
        asm volatile ("" : : "m" (URCU_TLS(malloc_nesting)));
 }
 
-__attribute__((constructor))
-void lttng_ust_malloc_wrapper_init(void)
+void lttng_ust_libc_wrapper_malloc_init(void)
 {
        /* Initialization already done */
        if (cur_alloc.calloc) {