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 /libc/unistd/confstr.c | |
| parent | 6b6ede3d15f04fe825cfa9f697507457e3640344 (diff) | |
Revert "resolve merge"
This reverts commit 6b6ede3d15f04fe825cfa9f697507457e3640344.
Diffstat (limited to 'libc/unistd/confstr.c')
| -rw-r--r-- | libc/unistd/confstr.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libc/unistd/confstr.c b/libc/unistd/confstr.c index 4d4c217e5..373644265 100644 --- a/libc/unistd/confstr.c +++ b/libc/unistd/confstr.c @@ -43,9 +43,12 @@ size_t confstr (int name, char *buf, size_t len) break; #ifdef __UCLIBC_HAS_THREADS__ case _CS_GNU_LIBPTHREAD_VERSION: -# if defined __UCLIBC_HAS_LINUXTHREADS__ +# if defined __LINUXTHREADS_OLD__ 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__) "." \ |