diff --git a/CHANGES b/CHANGES index 52f0229..0b95224 100644 --- a/CHANGES +++ b/CHANGES @@ -58,6 +58,9 @@ The following are the changes from calc version 2.12.4.0 to date: Updated 'help obj' to reflect changes to 'show objfunctions' and resource file example list since 1999. + Fixed problem where CALC_BYTE_ORDER refering to CALC_BIG_ENDIAN + and CALC_LITTLE_ENDIAN instead of BIG_ENDIAN and LITTLE_ENDIAN. + The following are the changes from calc version 2.12.3.0 to 2.12.3.3: @@ -6795,8 +6798,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.20 $ -## @(#) $Id: CHANGES,v 30.20 2010/09/02 06:36:48 chongo Exp $ +## @(#) $Revision: 30.21 $ +## @(#) $Id: CHANGES,v 30.21 2010/09/02 09:50:19 chongo Exp $ ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $ ## ## Under source code control: 1993/06/02 18:12:57 diff --git a/Makefile b/Makefile index d984e7c..e535131 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.44 $$ -# @(#) $Id: Makefile.ship,v 30.44 2010/09/02 06:07:07 chongo Exp $ +MAKEFILE_REV= $$Revision: 30.46 $$ +# @(#) $Id: Makefile.ship,v 30.46 2010/09/02 09:48:41 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $ # # Under source code control: 1990/02/15 01:48:41 @@ -132,8 +132,8 @@ HAVE_VSPRINTF= # Select CALC_BYTE_ORDER= -DCALC_LITTLE_ENDIAN for DJGPP. # CALC_BYTE_ORDER= -#CALC_BYTE_ORDER= -DCALC_BIG_ENDIAN -#CALC_BYTE_ORDER= -DCALC_LITTLE_ENDIAN +#CALC_BYTE_ORDER= -DBIG_ENDIAN +#CALC_BYTE_ORDER= -DLITTLE_ENDIAN # Determine the number of bits in a long # @@ -997,7 +997,7 @@ EXT= # The default calc versions # -VERSION= 2.12.4.2 +VERSION= 2.12.4.3 VERS= 2.12.4 VER= 2.12 VE= 2 diff --git a/Makefile.simple b/Makefile.simple index 3da4d65..90cfe58 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.44 $$ -# @(#) $Id: Makefile.ship,v 30.44 2010/09/02 06:07:07 chongo Exp $ +MAKEFILE_REV= $$Revision: 30.46 $$ +# @(#) $Id: Makefile.ship,v 30.46 2010/09/02 09:48:41 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $ # # Under source code control: 1990/02/15 01:48:41 @@ -117,8 +117,8 @@ HAVE_VSPRINTF= # Select CALC_BYTE_ORDER= -DCALC_LITTLE_ENDIAN for DJGPP. # CALC_BYTE_ORDER= -#CALC_BYTE_ORDER= -DCALC_BIG_ENDIAN -#CALC_BYTE_ORDER= -DCALC_LITTLE_ENDIAN +#CALC_BYTE_ORDER= -DBIG_ENDIAN +#CALC_BYTE_ORDER= -DLITTLE_ENDIAN # Determine the number of bits in a long # @@ -974,7 +974,7 @@ EXT= # The default calc versions # -VERSION= 2.12.4.2 +VERSION= 2.12.4.3 VERS= 2.12.4 VER= 2.12 VE= 2 diff --git a/custom/Makefile b/custom/Makefile index a723d8a..403e784 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.21 $ -# @(#) $Id: Makefile.head,v 30.21 2008/11/05 17:38:01 chongo Exp $ +# @(#) $Revision: 30.22 $ +# @(#) $Id: Makefile.head,v 30.22 2010/09/02 09:48:42 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/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.2 +VERSION= 2.12.4.3 VERS= 2.12.4 VER= 2.12 VE= 2 diff --git a/custom/Makefile.head b/custom/Makefile.head index d214b81..cdc44ac 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.21 $ -# @(#) $Id: Makefile.head,v 30.21 2008/11/05 17:38:01 chongo Exp $ +# @(#) $Revision: 30.22 $ +# @(#) $Id: Makefile.head,v 30.22 2010/09/02 09:48:42 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/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.2 +VERSION= 2.12.4.3 VERS= 2.12.4 VER= 2.12 VE= 2 diff --git a/custom/Makefile.simple b/custom/Makefile.simple index 34e77b6..b6141a7 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.21 $ -# @(#) $Id: Makefile.head,v 30.21 2008/11/05 17:38:01 chongo Exp $ +# @(#) $Revision: 30.22 $ +# @(#) $Id: Makefile.head,v 30.22 2010/09/02 09:48:42 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/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.2 +VERSION= 2.12.4.3 VERS= 2.12.4 VER= 2.12 VE= 2 diff --git a/endian.c b/endian.c index 5ea95ce..695329f 100644 --- a/endian.c +++ b/endian.c @@ -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.2 $ - * @(#) $Id: endian.c,v 30.2 2007/09/29 16:56:40 chongo Exp $ + * @(#) $Revision: 30.3 $ + * @(#) $Id: endian.c,v 30.3 2010/09/02 09:47:46 chongo Exp $ * @(#) $Source: /usr/local/src/cmd/calc/RCS/endian.c,v $ * * Under source code control: 1993/11/15 04:32:58 @@ -77,9 +77,9 @@ main(void) printf("#define LITTLE_ENDIAN\t1234\n"); printf("#undef CALC_BYTE_ORDER\n"); -#if defined(CALC_BIG_ENDIAN) +#if defined(BIG_ENDIAN) printf("#define CALC_BYTE_ORDER\tBIG_ENDIAN\n"); -#elif defined(CALC_LITTLE_ENDIAN) +#elif defined(LITTLE_ENDIAN) printf("#define CALC_BYTE_ORDER\tLITTLW_ENDIAN\n"); #else /* Determine byte order */ @@ -93,8 +93,8 @@ main(void) fprintf(stderr, "@=-=@ Fatal build error - cannot @=-=@\n"); fprintf(stderr, "@=-=@ determine byte order. Set @=-=@\n"); fprintf(stderr, "@=-=@ ${CALC_BYTE_ORDER} in the Makefile @=-=@\n"); - fprintf(stderr, "@=-=@ to be either -DCALC_BIG_ENDIAN or @=-=@\n"); - fprintf(stderr, "@=-=@ to be -DCALC_LITTLE_ENDIAN @=-=@\n"); + fprintf(stderr, "@=-=@ to be either -DBIG_ENDIAN or @=-=@\n"); + fprintf(stderr, "@=-=@ to be -DLITTLE_ENDIAN @=-=@\n"); exit(1); } #endif diff --git a/version.c b/version.c index 5f5b6f6..06efc2a 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.12 $ - * @(#) $Id: version.c,v 30.12 2010/09/02 06:36:48 chongo Exp $ + * @(#) $Revision: 30.13 $ + * @(#) $Id: version.c,v 30.13 2010/09/02 09:50:19 chongo Exp $ * @(#) $Source: /usr/local/src/cmd/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 2 /* minor software level or 0 if not patched */ +#define MINOR_PATCH 3 /* minor software level or 0 if not patched */ /*