[git commit nptl] correctly quote version in confstr

Austin Foxley austinf at cetoncorp.com
Tue Apr 6 15:17:30 UTC 2010


commit: http://git.uclibc.org/uClibc/commit/?id=e0a9623c6c30faf915b31358824aa2f8031df8b2
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl

Signed-off-by: Austin Foxley <austinf at cetoncorp.com>
---
 libc/unistd/confstr.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libc/unistd/confstr.c b/libc/unistd/confstr.c
index 957ee4d..8cd4ac5 100644
--- a/libc/unistd/confstr.c
+++ b/libc/unistd/confstr.c
@@ -24,6 +24,7 @@
 
 
 #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.
@@ -52,9 +53,9 @@ 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 " \
-		#__UCLIBC_MAJOR__ "." \
-		#__UCLIBC_MINOR__ "." \
-		#__UCLIBC_SUBLEVEL__)
+		QUOTEME(__UCLIBC_MAJOR__) "." \
+		QUOTEME(__UCLIBC_MINOR__) "." \
+		QUOTEME(__UCLIBC_SUBLEVEL__) )
       string = __NPTL_VERSION;
       string_len = sizeof(__NPTL_VERSION);
 # endif
-- 
1.6.3.3



More information about the uClibc-cvs mailing list