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

branches/cnb_branches/cnb_branch_20090301/ppSub/src

@@ -10 +10 @@
 stamp-h1
 ppSubKernel
+ppSubErrorCodes.h
+ppSubErrorCodes.c
+ppSubVersionDefinitions.h

@@ -10 +10 @@
 stamp-h1
 ppSubKernel
+ppSubErrorCodes.h
+ppSubErrorCodes.c
+ppSubVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/ppSub/src/ppSubVersion.c

@@ -22 +22 @@
 
 #include "ppSub.h"
+#include "ppSubVersionDefinitions.h"
 
 #ifndef PPSUB_VERSION
@@ -33 +34 @@
 #endif
 
-#define xstr(s) str(s)
-#define str(s) #s
-
 psString ppSubVersion(void)
 {
     char *value = NULL;
-    psStringAppend(&value, "%s@%s", xstr(PPSUB_BRANCH), xstr(PPSUB_VERSION));
+    psStringAppend(&value, "%s@%s", PPSUB_BRANCH, PPSUB_VERSION);
     return value;
 }
@@ -45 +43 @@
 psString ppSubSource(void)
 {
-    return psStringCopy(xstr(PPSUB_SOURCE));
+    return psStringCopy(PPSUB_SOURCE);
 }
 

@@ -10 +10 @@
 stamp-h1
 ppSubKernel
+ppSubErrorCodes.h
+ppSubErrorCodes.c
+ppSubVersionDefinitions.h