From e1e46622ac0fce73d802fa4a8a2e83cc25cd9e7a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 14 Feb 2015 23:04:02 -0600 Subject: Revert "resolve merge" This reverts commit 6b6ede3d15f04fe825cfa9f697507457e3640344. --- libc/stdlib/malloc-standard/malloc.h | 2 +- libc/stdlib/malloc/malloc.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'libc/stdlib') diff --git a/libc/stdlib/malloc-standard/malloc.h b/libc/stdlib/malloc-standard/malloc.h index f3e2d2a2a..1a4cc5a62 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 __UCLIBC_HAS_LINUXTHREADS__ +#if defined __UCLIBC_HAS_THREADS__ && !defined __LINUXTHREADS_OLD__ attribute_hidden #endif ; diff --git a/libc/stdlib/malloc/malloc.h b/libc/stdlib/malloc/malloc.h index 75262593f..53683c479 100644 --- a/libc/stdlib/malloc/malloc.h +++ b/libc/stdlib/malloc/malloc.h @@ -199,13 +199,13 @@ extern void __malloc_debug_printf (int indent, const char *fmt, ...) attribute_h extern struct heap_free_area *__malloc_heap attribute_hidden; #ifdef __UCLIBC_HAS_THREADS__ __UCLIBC_MUTEX_EXTERN(__malloc_heap_lock) -# ifndef __UCLIBC_HAS_LINUXTHREADS__ +# ifndef __LINUXTHREADS_OLD__ attribute_hidden # endif ; # ifdef __UCLIBC_UCLINUX_BROKEN_MUNMAP__ __UCLIBC_MUTEX_EXTERN(__malloc_mmb_heap_lock) -# ifndef __UCLIBC_HAS_LINUXTHREADS__ +# ifndef __LINUXTHREADS_OLD__ attribute_hidden # endif ; -- cgit v1.2.3