X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-libc-wrapper%2Flttng-ust-malloc.c;h=1e9a25e5c89dbbefbf6ff819a3a37a2e7d8d8c24;hb=9fe043d73a3e2112f859ce1fa489021a96efecc9;hp=9e7d1e63f2893668343adb172406497b76f81ca6;hpb=50170875992c5de7d6fcc1b3f953502391a8e82b;p=lttng-ust.git

diff --git a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
index 9e7d1e63..1e9a25e5 100644
--- a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
+++ b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define _GNU_SOURCE
 /*
  * Do _not_ define _LGPL_SOURCE because we don't want to create a
  * circular dependency loop between this malloc wrapper, liburcu and
@@ -122,7 +121,7 @@ void *static_calloc_aligned(size_t nmemb, size_t size, size_t alignment)
 	res_offset = CMM_LOAD_SHARED(static_calloc_buf_offset);
 	do {
 		prev_offset = res_offset;
-		aligned_offset = ALIGN(prev_offset + sizeof(size_t), alignment);
+		aligned_offset = LTTNG_UST_ALIGN(prev_offset + sizeof(size_t), alignment);
 		new_offset = aligned_offset + nmemb * size;
 		if (new_offset > sizeof(static_calloc_buf)) {
 			abort();