* version.c: Unmade some changes to my private copy that got

[bpt/guile.git] / libguile / version.c

diff --git a/libguile/version.c b/libguile/version.c
index 5e53b46..cd973e8 100644 (file)
--- a/libguile/version.c
+++ b/libguile/version.c
@@ -59,7 +59,7 @@ SCM_DEFINE (scm_major_version, "major-version", 0, 0, 0,
             "E.g., the 1 in \"1.6.5\".")
 #define FUNC_NAME s_scm_major_version
 {
-  return scm_number_to_string (SCM_MAKINUM(1),
+  return scm_number_to_string (SCM_MAKINUM(SCM_MAJOR_VERSION),
                                SCM_MAKINUM(10));
 }
 #undef FUNC_NAME
@@ -72,7 +72,7 @@ SCM_DEFINE (scm_minor_version, "minor-version", 0, 0, 0,
             "E.g., the 6 in \"1.6.5\".")
 #define FUNC_NAME s_scm_minor_version
 {
-  return scm_number_to_string (SCM_MAKINUM(7),
+  return scm_number_to_string (SCM_MAKINUM(SCM_MINOR_VERSION),
                                SCM_MAKINUM(10));
 }
 #undef FUNC_NAME
@@ -85,7 +85,7 @@ SCM_DEFINE (scm_micro_version, "micro-version", 0, 0, 0,
             "E.g., the 5 in \"1.6.5\".")
 #define FUNC_NAME s_scm_micro_version
 {
-  return scm_number_to_string (SCM_MAKINUM(0),
+  return scm_number_to_string (SCM_MAKINUM(SCM_MICRO_VERSION),
                                SCM_MAKINUM(10));
 }
 #undef FUNC_NAME
@@ -110,17 +110,15 @@ SCM_DEFINE (scm_version, "version", 0, 0, 0,
 
   char version_str[3 * 4 + 3];
 
-#if 0
 #if SCM_MAJOR_VERSION > 9999 \
     || SCM_MINOR_VERSION > 9999 \
     || SCM_MICRO_VERSION > 9999
 # error version string may overflow buffer
-#endif
 #endif
   sprintf (version_str, "%d.%d.%d",
-           1,
-           7,
-           0);
+           SCM_MAJOR_VERSION,
+           SCM_MINOR_VERSION,
+           SCM_MICRO_VERSION);
   return scm_makfrom0str (version_str);
 }
 #undef FUNC_NAME
@@ -142,12 +140,10 @@ SCM_DEFINE (scm_effective_version, "effective-version", 0, 0, 0,
 
   char version_str[2 * 4 + 3];
 
-#if 0
 #if (SCM_MAJOR_VERSION > 9999 || SCM_MINOR_VERSION > 9999)
 # error version string may overflow buffer
 #endif
-#endif
-  sprintf (version_str, "%d.%d", 1, 7);
+  sprintf (version_str, "%d.%d", SCM_MAJOR_VERSION, SCM_MINOR_VERSION);
   return scm_makfrom0str (version_str);
 }
 #undef FUNC_NAME