diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-14 23:04:02 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-14 23:04:02 -0600 |
| commit | e1e46622ac0fce73d802fa4a8a2e83cc25cd9e7a (patch) | |
| tree | 2c8d14e4dcc733f4227f0984ed05da5826b13acd /include | |
| parent | 6b6ede3d15f04fe825cfa9f697507457e3640344 (diff) | |
Revert "resolve merge"
This reverts commit 6b6ede3d15f04fe825cfa9f697507457e3640344.
Diffstat (limited to 'include')
| -rw-r--r-- | include/cancel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/cancel.h b/include/cancel.h index b60d21808..ac6f6b64d 100644 --- a/include/cancel.h +++ b/include/cancel.h @@ -48,7 +48,7 @@ #define __NC_PROTO(name) extern __typeof(name) __NC(name) attribute_hidden; #define __NC_OLD_PROTO(name) extern __typeof(name) __NC_OLD(name); -#if defined __UCLIBC_HAS_THREADS__ && !defined __UCLIBC_HAS_LINUXTHREADS__ +#if defined __UCLIBC_HAS_THREADS__ && !defined __LINUXTHREADS_OLD__ # define __NEW_THREADS 1 #else # define SINGLE_THREAD_P 1 @@ -71,7 +71,7 @@ res_type weak_function name param_list \ # define lt_strong_alias(name) # define lt_libc_hidden(name) libc_hidden_def(name) -#elif defined __UCLIBC_HAS_LINUXTHREADS__ +#elif defined __LINUXTHREADS_OLD__ # define CANCELLABLE_SYSCALL(res_type, name, param_list, params) \ weak_alias(__NC(name),name) \ |