summaryrefslogtreecommitdiff
path: root/libguile/version.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2010-03-16 20:58:24 +0100
committerAndy Wingo <wingo@pobox.com>2010-03-16 21:20:29 +0100
commit89607fab50ed88dff3b6fb5310a6753da8dbaa97 (patch)
tree0752ed0a372d9e03bb08f10834610a5dccd0b3b3 /libguile/version.c
parent462bcfd03847a568b34074ba6fcf4f7f4de3c0fc (diff)
downloadguile-89607fab50ed88dff3b6fb5310a6753da8dbaa97.tar.gz
version.h has SCM_EFFECTIVE_VERSION; effective-version uses that
* libguile/version.c (scm_effective_version): Use SCM_EFFECTIVE_VERSION. * libguile/version.h.in (SCM_EFFECTIVE_VERSION): Define from GUILE_EFFECTIVE_VERSION. * libguile/Makefile.am (version.h): Subst in GUILE_EFFECTIVE_VERSION. * test-suite/tests/version.test ("version reporting works"): The effective version is not necessarily MAJOR.MINOR. Remove check.
Diffstat (limited to 'libguile/version.c')
-rw-r--r--libguile/version.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/libguile/version.c b/libguile/version.c
index db1bc9f2e..f1bd3c3f9 100644
--- a/libguile/version.c
+++ b/libguile/version.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996, 1999, 2000, 2001, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996, 1999, 2000, 2001, 2006, 2008, 2010 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -105,14 +105,7 @@ SCM_DEFINE (scm_effective_version, "effective-version", 0, 0, 0,
"@end lisp")
#define FUNC_NAME s_scm_effective_version
{
-
- char version_str[2 * 4 + 3];
-
-#if (SCM_MAJOR_VERSION > 9999 || SCM_MINOR_VERSION > 9999)
-# error version string may overflow buffer
-#endif
- sprintf (version_str, "%d.%d", SCM_MAJOR_VERSION, SCM_MINOR_VERSION);
- return scm_from_locale_string (version_str);
+ return scm_from_locale_string (SCM_EFFECTIVE_VERSION);
}
#undef FUNC_NAME