From 6b6ede3d15f04fe825cfa9f697507457e3640344 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 14 Feb 2015 23:00:19 -0600 Subject: resolve merge --- libc/stdlib/malloc-standard/malloc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libc/stdlib/malloc-standard') diff --git a/libc/stdlib/malloc-standard/malloc.h b/libc/stdlib/malloc-standard/malloc.h index 1a4cc5a62..f3e2d2a2a 100644 --- a/libc/stdlib/malloc-standard/malloc.h +++ b/libc/stdlib/malloc-standard/malloc.h @@ -27,7 +27,7 @@ __UCLIBC_MUTEX_EXTERN(__malloc_lock) -#if defined __UCLIBC_HAS_THREADS__ && !defined __LINUXTHREADS_OLD__ +#if defined __UCLIBC_HAS_THREADS__ && !defined __UCLIBC_HAS_LINUXTHREADS__ attribute_hidden #endif ; -- cgit v1.2.3