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

branches/cnb_branches/cnb_branch_20090301/ppSim/src

@@ -8 +8 @@
 .libs
 ppSimSequence
+ppSimVersionDefinitions.h

@@ -8 +8 @@
 .libs
 ppSimSequence
+ppSimVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/ppSim/src/ppSimVersion.c

@@ -1 +1 @@
 #include "ppSim.h"
+#include "ppSimVersionDefinitions.h"
 
 #ifndef PPSIM_VERSION
@@ -11 +12 @@
 #endif
 
-#define xstr(s) str(s)
-#define str(s) #s
-
 psString ppSimVersion(void)
 {
     char *value = NULL;
-    psStringAppend(&value, "%s@%s", xstr(PPSIM_BRANCH), xstr(PPSIM_VERSION));
+    psStringAppend(&value, "%s@%s", PPSIM_BRANCH, PPSIM_VERSION);
     return value;
 }
@@ -23 +21 @@
 psString ppSimSource(void)
 {
-    return psStringCopy(xstr(PPSIM_SOURCE));
+    return psStringCopy(PPSIM_SOURCE);
 }
 

@@ -8 +8 @@
 .libs
 ppSimSequence
+ppSimVersionDefinitions.h