Index: trunk/ppArith/src/ppArithVersion.c
===================================================================
--- trunk/ppArith/src/ppArithVersion.c	(revision 23195)
+++ trunk/ppArith/src/ppArithVersion.c	(revision 23229)
@@ -22,6 +22,4 @@
 #include "ppArith.h"
 
-psString ppArithVersion(void)
-{
 #ifndef PPARITH_VERSION
 #error "PPARITH_VERSION is not set"
@@ -30,13 +28,21 @@
 #error "PPARITH_BRANCH is not set"
 #endif
-    return psStringCopy(PPARITH_BRANCH "@" PPARITH_VERSION);
+#ifndef PPARITH_SOURCE
+#error "PPARITH_SOURCE is not set"
+#endif
+
+#define xstr(s) str(s)
+#define str(s) #s
+
+psString ppArithVersion(void)
+{
+    char *value = NULL;
+    psStringAppend(&value, "%s@%s", xstr(PPARITH_BRANCH), xstr(PPARITH_VERSION));
+    return value;
 }
 
 psString ppArithSource(void)
 {
-#ifndef PPARITH_SOURCE
-#error "PPARITH_SOURCE is not set"
-#endif
-    return psStringCopy(PPARITH_SOURCE);
+    return psStringCopy(xstr(PPARITH_SOURCE));
 }