1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00

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

committed by mistake.
This commit is contained in:
Mikael Djurfeldt 2002-12-15 11:27:01 +00:00
parent edeea67b5a
commit 2ff4f18159
2 changed files with 12 additions and 11 deletions

View file

@ -1,3 +1,8 @@
2002-12-15 Mikael Djurfeldt <djurfeldt@nada.kth.se>
* version.c: Unmade some changes to my private copy that got
committed by mistake.
2002-12-11 Mikael Djurfeldt <mdj@kvast.blakulla.net> 2002-12-11 Mikael Djurfeldt <mdj@kvast.blakulla.net>
* gc-malloc.c, gc.h, init.c: Reverted gc-malloc change of * gc-malloc.c, gc.h, init.c: Reverted gc-malloc change of

View file

@ -59,7 +59,7 @@ SCM_DEFINE (scm_major_version, "major-version", 0, 0, 0,
"E.g., the 1 in \"1.6.5\".") "E.g., the 1 in \"1.6.5\".")
#define FUNC_NAME s_scm_major_version #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)); SCM_MAKINUM(10));
} }
#undef FUNC_NAME #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\".") "E.g., the 6 in \"1.6.5\".")
#define FUNC_NAME s_scm_minor_version #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)); SCM_MAKINUM(10));
} }
#undef FUNC_NAME #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\".") "E.g., the 5 in \"1.6.5\".")
#define FUNC_NAME s_scm_micro_version #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)); SCM_MAKINUM(10));
} }
#undef FUNC_NAME #undef FUNC_NAME
@ -110,17 +110,15 @@ SCM_DEFINE (scm_version, "version", 0, 0, 0,
char version_str[3 * 4 + 3]; char version_str[3 * 4 + 3];
#if 0
#if SCM_MAJOR_VERSION > 9999 \ #if SCM_MAJOR_VERSION > 9999 \
|| SCM_MINOR_VERSION > 9999 \ || SCM_MINOR_VERSION > 9999 \
|| SCM_MICRO_VERSION > 9999 || SCM_MICRO_VERSION > 9999
# error version string may overflow buffer # error version string may overflow buffer
#endif
#endif #endif
sprintf (version_str, "%d.%d.%d", sprintf (version_str, "%d.%d.%d",
1, SCM_MAJOR_VERSION,
7, SCM_MINOR_VERSION,
0); SCM_MICRO_VERSION);
return scm_makfrom0str (version_str); return scm_makfrom0str (version_str);
} }
#undef FUNC_NAME #undef FUNC_NAME
@ -142,12 +140,10 @@ SCM_DEFINE (scm_effective_version, "effective-version", 0, 0, 0,
char version_str[2 * 4 + 3]; char version_str[2 * 4 + 3];
#if 0
#if (SCM_MAJOR_VERSION > 9999 || SCM_MINOR_VERSION > 9999) #if (SCM_MAJOR_VERSION > 9999 || SCM_MINOR_VERSION > 9999)
# error version string may overflow buffer # error version string may overflow buffer
#endif #endif
#endif sprintf (version_str, "%d.%d", SCM_MAJOR_VERSION, SCM_MINOR_VERSION);
sprintf (version_str, "%d.%d", 1, 7);
return scm_makfrom0str (version_str); return scm_makfrom0str (version_str);
} }
#undef FUNC_NAME #undef FUNC_NAME