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

branches/cnb_branches/cnb_branch_20090301/psastro/src

@@ -17 +17 @@
 psastroModelFit
 psastroExtract
+psastroVersionDefinitions.h

@@ -17 +17 @@
 psastroModelFit
 psastroExtract
+psastroVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/psastro/src/psastroVersion.c

@@ -9 +9 @@
 
 #include "psastroInternal.h"
+#include "psastroVersionDefinitions.h"
 
 #ifndef PSASTRO_VERSION
@@ -20 +21 @@
 #endif
 
-#define xstr(s) str(s)
-#define str(s) #s
-
 psString psastroVersion(void)
 {
     char *value = NULL;
-    psStringAppend(&value, "%s@%s", xstr(PSASTRO_BRANCH), xstr(PSASTRO_VERSION));
+    psStringAppend(&value, "%s@%s", PSASTRO_BRANCH, PSASTRO_VERSION);
     return value;
 }
@@ -32 +30 @@
 psString psastroSource(void)
 {
-  return psStringCopy(xstr(PSASTRO_SOURCE));
+  return psStringCopy(PSASTRO_SOURCE);
 }
 

@@ -17 +17 @@
 psastroModelFit
 psastroExtract
+psastroVersionDefinitions.h