Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/psLib/src/sys/psConfigure.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psLib/src/sys (modified) (1 prop)
• psLib/src/sys/psConfigure.c (modified) (3 diffs)

branches/cnb_branches/cnb_branch_20090301/psLib/src/sys

@@ -11 +11 @@
 *.bbg
 *.da
+psVersionDefinitions.h

@@ -11 +11 @@
 *.bbg
 *.da
+psVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/psLib/src/sys/psConfigure.c

@@ -44 +44 @@
 #include "psMemory.h"
 
+#include "psVersionDefinitions.h"
+
 static char *memCheckName = NULL;       // Filename to which to write results of mem check
 static FILE *memCheckFile = NULL;       // File to which to write results of mem check
@@ -57 +59 @@
 #endif
 
-#define xstr(s) str(s)
-#define str(s) #s
-
 psString psLibVersion(void)
 {
     char *value = NULL;
-    psStringAppend(&value, "%s@%s", xstr(PSLIB_BRANCH), xstr(PSLIB_VERSION));
+    psStringAppend(&value, "%s@%s", PSLIB_BRANCH, PSLIB_VERSION);
     return value;
 }
@@ -69 +68 @@
 psString psLibSource(void)
 {
-    return psStringCopy(xstr(PSLIB_SOURCE));
+    return psStringCopy(PSLIB_SOURCE);
 }
 

@@ -11 +11 @@
 *.bbg
 *.da
+psVersionDefinitions.h