summaryrefslogtreecommitdiff
path: root/libc/unistd
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 /libc/unistd
parentf972c2262fd4efc2bbf9789dce145bb705acec24 (diff)
resolve merge
Diffstat (limited to 'libc/unistd')
-rw-r--r--libc/unistd/confstr.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libc/unistd/confstr.c b/libc/unistd/confstr.c
index 373644265..4d4c217e5 100644
--- a/libc/unistd/confstr.c
+++ b/libc/unistd/confstr.c
@@ -43,12 +43,9 @@ size_t confstr (int name, char *buf, size_t len)
break;
#ifdef __UCLIBC_HAS_THREADS__
case _CS_GNU_LIBPTHREAD_VERSION:
-# if defined __LINUXTHREADS_OLD__
+# if defined __UCLIBC_HAS_LINUXTHREADS__
string = "linuxthreads-0.01";
string_len = sizeof("linuxthreads-x.xx");
-# elif defined __LINUXTHREADS_NEW__
- string = "linuxthreads-0.10";
- string_len = sizeof("linuxthreads-x.xx");
# elif defined __UCLIBC_HAS_THREADS_NATIVE__
# define __NPTL_VERSION ("NPTL " \
__stringify(__UCLIBC_MAJOR__) "." \