diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-14 23:00:19 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-14 23:00:19 -0600 |
| commit | 6b6ede3d15f04fe825cfa9f697507457e3640344 (patch) | |
| tree | efe9bf75eaf2200f89087ed0ef2ef350549ccd6d /libc/stdlib/malloc-standard | |
| parent | f972c2262fd4efc2bbf9789dce145bb705acec24 (diff) | |
resolve merge
Diffstat (limited to 'libc/stdlib/malloc-standard')
| -rw-r--r-- | libc/stdlib/malloc-standard/malloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 ; |