Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ppMerge/src/ppMergeVersion.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)
• ppMerge/src (modified) (1 prop)
• ppMerge/src/ppMergeVersion.c (modified) (3 diffs)

branches/cnb_branches/cnb_branch_20090301/ppMerge/src

@@ -7 +7 @@
 stamp-h1
 .libs
+ppMergeVersionDefinitions.h

@@ -7 +7 @@
 stamp-h1
 .libs
+ppMergeVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/ppMerge/src/ppMergeVersion.c

@@ -21 +21 @@
 
 #include "ppMergeVersion.h"
+#include "ppMergeVersionDefinitions.h"
 
 #ifndef PPMERGE_VERSION
@@ -32 +33 @@
 #endif
 
-#define xstr(s) str(s)
-#define str(s) #s
-
 psString ppMergeVersion(void)
 {
     char *value = NULL;
-    psStringAppend(&value, "%s@%s", xstr(PPMERGE_BRANCH), xstr(PPMERGE_VERSION));
+    psStringAppend(&value, "%s@%s", PPMERGE_BRANCH, PPMERGE_VERSION);
     return value;
 }
@@ -44 +42 @@
 psString ppMergeSource(void)
 {
-    return psStringCopy(xstr(PPMERGE_SOURCE));
+    return psStringCopy(PPMERGE_SOURCE);
 }
 

@@ -7 +7 @@
 stamp-h1
 .libs
+ppMergeVersionDefinitions.h