* generic/tclBasic.c: Dropped the TCL_NO_MATH configuration.

        * generic/tclBinary.c:  It's believed this has not been working
        * generic/tclExecute.c: in a long time.  Tcl needs math.h.
        * unix/Makefile.in:     [RFE 1200680].

5 files changed, 15 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index 534532d..a790991 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-13  Don Porter  <dgp@users.sourceforge.net>
+
+	* generic/tclBasic.c:	Dropped the TCL_NO_MATH configuration.
+	* generic/tclBinary.c:	It's believed this has not been working
+	* generic/tclExecute.c: in a long time.  Tcl needs math.h.
+	* unix/Makefile.in:	[RFE 1200680].
+
 2005-05-12  Kevin Kenny  <kennykb@acm.org>
 
 	* doc/mathfunc.n: Changed NAME line to match the name of the page.
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 2ec1776..e2ea44b 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -13,15 +13,13 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclBasic.c,v 1.151 2005/05/10 18:34:06 kennykb Exp $
+ * RCS: @(#) $Id: tclBasic.c,v 1.152 2005/05/13 17:11:58 dgp Exp $
  */
 
 #include "tclInt.h"
 #include "tclCompile.h"
 #include <float.h>
-#ifndef TCL_NO_MATH
 #include <math.h>
-#endif
 
 /*
  * The following structure defines the client data for a math function
@@ -271,7 +269,6 @@ typedef struct {
 } BuiltinFuncDef;
 BuiltinFuncDef BuiltinFuncTable[] = {
     { "::tcl::mathfunc::abs",	ExprAbsFunc,	NULL 			},
-#ifndef TCL_NO_MATH
     { "::tcl::mathfunc::acos",	ExprUnaryFunc,	(ClientData) acos 	},
     { "::tcl::mathfunc::asin",	ExprUnaryFunc,	(ClientData) asin 	},
     { "::tcl::mathfunc::atan",	ExprUnaryFunc,	(ClientData) atan 	},
@@ -279,32 +276,23 @@ BuiltinFuncDef BuiltinFuncTable[] = {
     { "::tcl::mathfunc::ceil",	ExprUnaryFunc,	(ClientData) ceil 	},
     { "::tcl::mathfunc::cos",	ExprUnaryFunc,	(ClientData) cos 	},
     { "::tcl::mathfunc::cosh",	ExprUnaryFunc,	(ClientData) cosh	},
-#endif
     { "::tcl::mathfunc::double",ExprDoubleFunc,	NULL			},
-#ifndef TCL_NO_MATH
     { "::tcl::mathfunc::exp",	ExprUnaryFunc,	(ClientData) exp	},
     { "::tcl::mathfunc::floor",	ExprUnaryFunc,	(ClientData) floor 	},
     { "::tcl::mathfunc::fmod",	ExprBinaryFunc,	(ClientData) fmod	},
     { "::tcl::mathfunc::hypot",	ExprBinaryFunc,	(ClientData) hypot 	},
-#endif
     { "::tcl::mathfunc::int",	ExprIntFunc,	NULL			},
-#ifndef TCL_NO_MATH
     { "::tcl::mathfunc::log",	ExprUnaryFunc,	(ClientData) log 	},
     { "::tcl::mathfunc::log10",	ExprUnaryFunc,  (ClientData) log10 	},
     { "::tcl::mathfunc::pow",	ExprBinaryFunc,	(ClientData) pow 	},
-#endif
     { "::tcl::mathfunc::rand",	ExprRandFunc,	NULL			},
     { "::tcl::mathfunc::round",	ExprRoundFunc,	NULL			},
-#ifndef TCL_NO_MATH
     { "::tcl::mathfunc::sin",	ExprUnaryFunc,	(ClientData) sin 	},
     { "::tcl::mathfunc::sinh",	ExprUnaryFunc,	(ClientData) sinh 	},
     { "::tcl::mathfunc::sqrt",	ExprUnaryFunc,	(ClientData) sqrt 	},
-#endif
     { "::tcl::mathfunc::srand",	ExprSrandFunc,	NULL			},
-#ifndef TCL_NO_MATH
     { "::tcl::mathfunc::tan",	ExprUnaryFunc,	(ClientData) tan 	},
     { "::tcl::mathfunc::tanh",	ExprUnaryFunc,	(ClientData) tanh 	},
-#endif
     { "::tcl::mathfunc::wide",	ExprWideFunc,	NULL		 	},
     { NULL, NULL, NULL }
 };
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index fa75841..bb370e0 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -10,16 +10,12 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclBinary.c,v 1.23 2005/05/10 18:54:31 kennykb Exp $
+ * RCS: @(#) $Id: tclBinary.c,v 1.24 2005/05/13 17:11:59 dgp Exp $
  */
 
 #include "tclInt.h"
 
-#ifdef TCL_NO_MATH
-#define fabs(x) (x<0 ? -x : x)
-#else
 #include <math.h>
-#endif
 
 /*
  * The following constants are used by GetFormatSpec to indicate various
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 3333c79..0557515 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -11,15 +11,13 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclExecute.c,v 1.188 2005/05/10 18:34:35 kennykb Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.189 2005/05/13 17:12:17 dgp Exp $
  */
 
 #include "tclInt.h"
 #include "tclCompile.h"
 
-#ifndef TCL_NO_MATH
-#   include <math.h>
-#endif
+#include <math.h>
 #include <float.h>
 
 /*
diff --git a/unix/Makefile.in b/unix/Makefile.in
index fa228f2..c5f8da2 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.165 2005/05/10 18:35:25 kennykb Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.166 2005/05/13 17:12:19 dgp Exp $
 
 VERSION 		= @TCL_VERSION@
 MAJOR_VERSION		= @TCL_MAJOR_VERSION@
@@ -105,12 +105,6 @@ LDFLAGS			= @LDFLAGS_DEFAULT@ @LDFLAGS@
 PROTO_FLAGS		=
 #PROTO_FLAGS		= -DNO_PROTOTYPE
 
-# Mathematical functions like sin and atan2 are enabled for expressions
-# by default.  To disable them, reverse the comment characters on the
-# following pairs of lines:
-MATH_FLAGS		=
-#MATH_FLAGS		= -DTCL_NO_MATH
-
 # If you use the setenv, putenv, or unsetenv procedures to modify
 # environment variables in your application and you'd like those
 # modifications to appear in the "env" Tcl variable, switch the
@@ -273,18 +267,17 @@ DDD			= ddd
 
 CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
 -I${BUILD_DIR} -I${UNIX_DIR} -I${GENERIC_DIR} -DTCL_TOMMATH -I${TOMMATH_DIR} \
-${AC_FLAGS} ${MATH_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} \
+${AC_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} \
 ${NO_DEPRECATED_FLAGS} ${ENV_FLAGS}
 
 STUB_CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
 -I${BUILD_DIR} -I${UNIX_DIR} -I${GENERIC_DIR} -DTCL_TOMMATH -I${TOMMATH_DIR} \
-${AC_FLAGS} ${MATH_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} ${ENV_FLAGS}
+${AC_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} ${ENV_FLAGS}
 
 LIBS		= @TCL_LIBS@
 
 DEPEND_SWITCHES	= ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} \
-${AC_FLAGS} ${MATH_FLAGS} \
-${GENERIC_FLAGS} ${PROTO_FLAGS}
+${AC_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS}
 
 TCLSH_OBJS = tclAppInit.o