Index: trunk/psphot/src/psphotVersion.c
===================================================================
--- trunk/psphot/src/psphotVersion.c	(revision 23289)
+++ trunk/psphot/src/psphotVersion.c	(revision 23805)
@@ -1,3 +1,4 @@
 #include "psphotInternal.h"
+#include "psphotVersionDefinitions.h"
 
 #ifdef HAVE_KAPA
@@ -15,11 +16,8 @@
 #endif
 
-#define xstr(s) str(s)
-#define str(s) #s
-
 psString psphotVersion(void)
 {
     char *value = NULL;
-    psStringAppend(&value, "%s@%s", xstr(PSPHOT_BRANCH), xstr(PSPHOT_VERSION));
+    psStringAppend(&value, "%s@%s", PSPHOT_BRANCH, PSPHOT_VERSION);
     return value;
 }
@@ -27,5 +25,5 @@
 psString psphotSource(void)
 {
-    return psStringCopy(xstr(PSPHOT_SOURCE));
+    return psStringCopy(PSPHOT_SOURCE);
 }