mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-18 01:30:27 +02:00
Code Activity

version.h has SCM_EFFECTIVE_VERSION; effective-version uses that

Browse source 
* 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.
This commit is contained in:
Andy Wingo 2010-03-16 20:58:24 +01:00
parent 462bcfd038
commit 89607fab50
4 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libguile/version.c
View file

@ -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