diff --git a/CHANGES b/CHANGES index df64100..5765ed5 100644 --- a/CHANGES +++ b/CHANGES @@ -11,6 +11,9 @@ The following are the changes from calc version 2.12.4.6 to date: Libraries are chmodded as 0644 to allow for building rpms without root. + Silenced annoying warning about unused variable 'intp' + while compiline endian.c under some circumstances. + The following are the changes from calc version 2.12.4.3 to 2.12.4.5: @@ -6831,8 +6834,8 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1: ## received a copy with calc; if not, write to Free Software Foundation, Inc. ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ## -## @(#) $Revision: 30.25 $ -## @(#) $Id: CHANGES,v 30.25 2013/05/05 10:15:30 chongo Exp $ +## @(#) $Revision: 30.26 $ +## @(#) $Id: CHANGES,v 30.26 2013/05/19 22:10:34 chongo Exp $ ## @(#) $Source: /usr/local/src/bin/calc/RCS/CHANGES,v $ ## ## Under source code control: 1993/06/02 18:12:57 diff --git a/Makefile b/Makefile index 120ebbf..7e909a3 100644 --- a/Makefile +++ b/Makefile @@ -39,8 +39,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. # -MAKEFILE_REV= $$Revision: 30.50 $$ -# @(#) $Id: Makefile.ship,v 30.50 2013/05/05 10:21:52 chongo Exp $ +MAKEFILE_REV= $$Revision: 30.51 $$ +# @(#) $Id: Makefile.ship,v 30.51 2013/05/05 13:52:39 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $ # # Under source code control: 1990/02/15 01:48:41 @@ -997,7 +997,7 @@ EXT= # The default calc versions # -VERSION= 2.12.4.7 +VERSION= 2.12.4.8 VERS= 2.12.4 VER= 2.12 VE= 2 diff --git a/Makefile.simple b/Makefile.simple index 99dfb55..19a829e 100644 --- a/Makefile.simple +++ b/Makefile.simple @@ -39,8 +39,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. # -MAKEFILE_REV= $$Revision: 30.50 $$ -# @(#) $Id: Makefile.ship,v 30.50 2013/05/05 10:21:52 chongo Exp $ +MAKEFILE_REV= $$Revision: 30.51 $$ +# @(#) $Id: Makefile.ship,v 30.51 2013/05/05 13:52:39 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $ # # Under source code control: 1990/02/15 01:48:41 @@ -974,7 +974,7 @@ EXT= # The default calc versions # -VERSION= 2.12.4.7 +VERSION= 2.12.4.8 VERS= 2.12.4 VER= 2.12 VE= 2 diff --git a/custom/Makefile b/custom/Makefile index fa9cec2..b8cc66d 100644 --- a/custom/Makefile +++ b/custom/Makefile @@ -18,8 +18,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# @(#) $Revision: 30.25 $ -# @(#) $Id: Makefile.head,v 30.25 2013/05/05 10:21:52 chongo Exp $ +# @(#) $Revision: 30.26 $ +# @(#) $Id: Makefile.head,v 30.26 2013/05/05 13:52:40 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $ # # Under source code control: 1997/03/09 02:28:54 @@ -366,7 +366,7 @@ EXT= # The default calc versions # -VERSION= 2.12.4.7 +VERSION= 2.12.4.8 VERS= 2.12.4 VER= 2.12 VE= 2 diff --git a/custom/Makefile.head b/custom/Makefile.head index 7676462..4989692 100644 --- a/custom/Makefile.head +++ b/custom/Makefile.head @@ -18,8 +18,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# @(#) $Revision: 30.25 $ -# @(#) $Id: Makefile.head,v 30.25 2013/05/05 10:21:52 chongo Exp $ +# @(#) $Revision: 30.26 $ +# @(#) $Id: Makefile.head,v 30.26 2013/05/05 13:52:40 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $ # # Under source code control: 1997/03/09 02:28:54 @@ -366,7 +366,7 @@ EXT= # The default calc versions # -VERSION= 2.12.4.7 +VERSION= 2.12.4.8 VERS= 2.12.4 VER= 2.12 VE= 2 diff --git a/custom/Makefile.simple b/custom/Makefile.simple index 158f26a..7f64d3d 100644 --- a/custom/Makefile.simple +++ b/custom/Makefile.simple @@ -18,8 +18,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# @(#) $Revision: 30.25 $ -# @(#) $Id: Makefile.head,v 30.25 2013/05/05 10:21:52 chongo Exp $ +# @(#) $Revision: 30.26 $ +# @(#) $Id: Makefile.head,v 30.26 2013/05/05 13:52:40 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $ # # Under source code control: 1997/03/09 02:28:54 @@ -351,7 +351,7 @@ EXT= # The default calc versions # -VERSION= 2.12.4.7 +VERSION= 2.12.4.8 VERS= 2.12.4 VER= 2.12 VE= 2 diff --git a/endian.c b/endian.c index 631903c..358e270 100644 --- a/endian.c +++ b/endian.c @@ -1,7 +1,7 @@ /* * endian - determine the byte order of a long on your machine * - * Copyright (C) 1999 Landon Curt Noll + * Copyright (C) 1999-2013 Landon Curt Noll * * Calc is open software; you can redistribute it and/or modify it under * the terms of the version 2.1 of the GNU Lesser General Public License @@ -17,8 +17,8 @@ * received a copy with calc; if not, write to Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * @(#) $Revision: 30.3 $ - * @(#) $Id: endian.c,v 30.3 2010/09/02 09:47:46 chongo Exp $ + * @(#) $Revision: 30.4 $ + * @(#) $Id: endian.c,v 30.4 2013/05/05 13:57:08 chongo Exp $ * @(#) $Source: /usr/local/src/bin/calc/RCS/endian.c,v $ * * Under source code control: 1993/11/15 04:32:58 @@ -54,7 +54,9 @@ int main(void) { /* pointers into the byte order array */ +#if defined(DEBUG) || (!defined(BIG_ENDIAN) && !defined(BIG_ENDIAN)) int *intp = (int *)byte; +#endif #if defined(DEBUG) short *shortp = (short *)byte; long *longp = (long *)byte; diff --git a/version.c b/version.c index 0b91a69..fe2ceab 100644 --- a/version.c +++ b/version.c @@ -19,8 +19,8 @@ * received a copy with calc; if not, write to Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * @(#) $Revision: 30.16 $ - * @(#) $Id: version.c,v 30.16 2013/05/05 10:16:02 chongo Exp $ + * @(#) $Revision: 30.17 $ + * @(#) $Id: version.c,v 30.17 2013/05/19 22:10:34 chongo Exp $ * @(#) $Source: /usr/local/src/bin/calc/RCS/version.c,v $ * * Under source code control: 1990/05/22 11:00:58 @@ -49,7 +49,7 @@ static char *program; #define MAJOR_VER 2 /* major library version */ #define MINOR_VER 12 /* minor library version */ #define MAJOR_PATCH 4 /* major software level under library version */ -#define MINOR_PATCH 7 /* minor software level or 0 if not patched */ +#define MINOR_PATCH 8 /* minor software level or 0 if not patched */ /*