diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-23 13:15:08 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-23 13:15:08 +0200 |
| commit | 7a4df0aacf25654e5baed2ef3559d961a5c538d7 (patch) | |
| tree | 41aa7d282f9c01957f092b73acb155f9a7658fb1 /sysdeps | |
| parent | b4fc5f292e5186b7092550d7251033ca68d9f104 (diff) | |
| parent | 9295bc48dd22a8358a595b9cebffdfc09d4166cd (diff) | |
Merge branch 'master-glibc-2.21' into master-glibc-2.22
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/pthread/bits/libc-lockP.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/pthread/bits/libc-lockP.h b/sysdeps/pthread/bits/libc-lockP.h index 3cfbc18..2631e0c 100644 --- a/sysdeps/pthread/bits/libc-lockP.h +++ b/sysdeps/pthread/bits/libc-lockP.h @@ -37,7 +37,7 @@ #endif /* Call thread functions through the function pointer table. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # define PTFAVAIL(NAME) __libc_pthread_functions_init # define __libc_ptf_call(FUNC, ARGS, ELSE) \ (__libc_pthread_functions_init ? PTHFCT_CALL (ptr_##FUNC, ARGS) : ELSE) |