summaryrefslogtreecommitdiff
path: root/libc/unistd/confstr.c
diff options
context:
space:
mode:
authorAustin Foxley <austinf@cetoncorp.com>2010-04-12 06:18:10 -0700
committerAustin Foxley <austinf@cetoncorp.com>2010-04-12 06:18:10 -0700
commit6cc4f58c6382c850ce97f32f56d1a3ff00ca4585 (patch)
tree19a2f25da5db93c2cb620c0da3c38d3bffd0b784 /libc/unistd/confstr.c
parentc58dd2b2aabda615aa333cdbb023defbf00b30a3 (diff)
parente90c33f951efc032ca23f48326343a83c0b54b10 (diff)
Merge remote branch 'origin/master' into nptl
Conflicts: libc/unistd/confstr.c Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libc/unistd/confstr.c')
-rw-r--r--libc/unistd/confstr.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libc/unistd/confstr.c b/libc/unistd/confstr.c
index 8cd4ac59e..fc0bd599e 100644
--- a/libc/unistd/confstr.c
+++ b/libc/unistd/confstr.c
@@ -24,7 +24,6 @@
#define CS_PATH "/bin:/usr/bin"
-#define QUOTEME(x) #x
/* If BUF is not NULL and LEN > 0, fill in at most LEN - 1 bytes
of BUF with the value corresponding to NAME and zero-terminate BUF.
@@ -53,11 +52,13 @@ size_t confstr (int name, char *buf, size_t len)
string_len = sizeof("linuxthreads-x.xx");
# elif defined __UCLIBC_HAS_THREADS_NATIVE__
# define __NPTL_VERSION ("NPTL " \
- QUOTEME(__UCLIBC_MAJOR__) "." \
- QUOTEME(__UCLIBC_MINOR__) "." \
- QUOTEME(__UCLIBC_SUBLEVEL__) )
+ __stringify(__UCLIBC_MAJOR__) "." \
+ __stringify(__UCLIBC_MINOR__) "." \
+ __stringify(__UCLIBC_SUBLEVEL__))
string = __NPTL_VERSION;
string_len = sizeof(__NPTL_VERSION);
+# else
+# error unable to determine thread impl
# endif
break;
#endif