From 6678ee462153f79ea3258c65a6e3902f6aa68de1 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Mon, 10 Oct 2005 18:00:09 +0000
Subject:         * generic/tclExecute.c: Corrections to the NO_WIDE_TYPE
 build.         * generic/tclInt.h:     Restored HEAD to the NO_WIDE_TYPE     
    configuration until some breakage in the #undef NO_WIDE_TYPE        
 configuration is corrected.

---
 ChangeLog            |  7 +++++++
 generic/tclExecute.c | 10 ++++++----
 generic/tclInt.h     |  4 ++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4de4612..3b8579a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-10  Don Porter  <dgp@users.sourceforge.net>
+
+	* generic/tclExecute.c:	Corrections to the NO_WIDE_TYPE build.
+	* generic/tclInt.h:	Restored HEAD to the NO_WIDE_TYPE
+	configuration until some breakage in the #undef NO_WIDE_TYPE
+	configuration is corrected.
+
 2005-10-10  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
 
 	* generic/tclInterp.c (DeleteScriptLimitCallback) 
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 8576e62..12ca59d 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -12,7 +12,7 @@
  * 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.205 2005/10/10 16:09:17 msofer Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.206 2005/10/10 18:00:10 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -339,7 +339,7 @@ long		tclObjsShared[TCL_MAX_SHARED_OBJ_STATS] = { 0, 0, 0, 0, 0 };
  *			ClientData *ptrPtr, int *tPtr);
  */
 
-#ifdef TCL_WIDE_INT_IS_LONG
+#ifdef NO_WIDE_TYPE
 
 #define GetNumberFromObj(interp, objPtr, ptrPtr, tPtr)			\
     (((objPtr)->typePtr == &tclIntType)					\
@@ -397,7 +397,7 @@ long		tclObjsShared[TCL_MAX_SHARED_OBJ_STATS] = { 0, 0, 0, 0, 0 };
  *			Tcl_WideInt *wideIntPtr);
  */
 
-#ifdef TCL_WIDE_INT_IS_LONG
+#ifdef NO_WIDE_TYPE
 #define TclGetWideIntFromObj(interp, objPtr, wideIntPtr)		\
     (((objPtr)->typePtr == &tclIntType)					\
 	? (*(wideIntPtr) = (Tcl_WideInt)				\
@@ -3378,8 +3378,10 @@ TclExecuteByteCode(interp, codePtr)
 	int iResult = 0, compare = 0, type1, type2;
 	double d1, d2, tmp;
 	long l1, l2;
-	Tcl_WideInt w1, w2;
 	mp_int big1, big2;
+#ifndef NO_WIDE_TYPE
+	Tcl_WideInt w1, w2;
+#endif
 
 	if (GetNumberFromObj(NULL, valuePtr, &ptr1, &type1) != TCL_OK) {
 	    /* At least one non-numeric argument - compare as strings */
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 6dd07b0..117c25e 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclInt.h,v 1.253 2005/10/08 14:42:45 dgp Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.254 2005/10/10 18:00:10 dgp Exp $
  */
 
 #ifndef _TCLINT
@@ -22,7 +22,7 @@
  * Some numerics configuration options
  */
 
-#undef NO_WIDE_TYPE
+#define NO_WIDE_TYPE
 #undef ACCEPT_NAN
 
 /*
-- 
cgit v0.12