summaryrefslogtreecommitdiff
path: root/include/cancel.h
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-02-14 23:00:19 -0600
committerWaldemar Brodkorb <wbx@openadk.org>2015-02-14 23:00:19 -0600
commit6b6ede3d15f04fe825cfa9f697507457e3640344 (patch)
treeefe9bf75eaf2200f89087ed0ef2ef350549ccd6d /include/cancel.h
parentf972c2262fd4efc2bbf9789dce145bb705acec24 (diff)
resolve merge
Diffstat (limited to 'include/cancel.h')
-rw-r--r--include/cancel.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/cancel.h b/include/cancel.h
index ac6f6b64d..b60d21808 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 __LINUXTHREADS_OLD__
+#if defined __UCLIBC_HAS_THREADS__ && !defined __UCLIBC_HAS_LINUXTHREADS__
# 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 __LINUXTHREADS_OLD__
+#elif defined __UCLIBC_HAS_LINUXTHREADS__
# define CANCELLABLE_SYSCALL(res_type, name, param_list, params) \
weak_alias(__NC(name),name) \