Made HEAD build on Windows VC++ again.

9 files changed, 40 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index b447296..d9799f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-03-19  Kevin B. Kenny   <kennykb@acm.org>
+
+	* compat/strtoll.c:
+	* compat/strtoull.c:
+	* generic/tclIntDecls.h:
+	* generic/tclMain.c:
+	* generic/tclObj.c:
+	* win/tclWinDde.c:
+	* win/tclWinReg.c:
+	* win/tclWinTime.c:        Made HEAD build on Windows VC++ again.
+	
 2004-03-19  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
 
 	* generic/tclIntDecls.h: Made HEAD build on Solaris again by
diff --git a/compat/strtoll.c b/compat/strtoll.c
index ca00fd0..a28ffea 100644
--- a/compat/strtoll.c
+++ b/compat/strtoll.c
@@ -9,11 +9,11 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: strtoll.c,v 1.5 2002/02/24 02:53:25 dgp Exp $
+ * RCS: @(#) $Id: strtoll.c,v 1.6 2004/03/19 18:33:51 kennykb Exp $
  */
 
 #include "tcl.h"
-#include "tclPort.h"
+#include "tclInt.h"
 #include <ctype.h>
 
 #define TCL_WIDEINT_MAX	(((Tcl_WideUInt)Tcl_LongAsWide(-1))>>1)
diff --git a/compat/strtoull.c b/compat/strtoull.c
index 00eca3c..654173c 100644
--- a/compat/strtoull.c
+++ b/compat/strtoull.c
@@ -9,11 +9,11 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: strtoull.c,v 1.5 2002/02/24 02:53:25 dgp Exp $
+ * RCS: @(#) $Id: strtoull.c,v 1.6 2004/03/19 18:33:52 kennykb Exp $
  */
 
 #include "tcl.h"
-#include "tclPort.h"
+#include "tclInt.h"
 #include <ctype.h>
 
 /*
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index a46e585..c92dfcc 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclIntDecls.h,v 1.59 2004/03/19 16:15:39 dkf Exp $
+ * RCS: @(#) $Id: tclIntDecls.h,v 1.60 2004/03/19 18:33:52 kennykb Exp $
  */
 
 #ifndef _TCLINTDECLS
@@ -19,6 +19,11 @@
 
 #include "tclPort.h"
 
+#ifdef BUILD_tcl
+#   undef TCL_STORAGE_CLASS
+#   define TCL_STORAGE_CLASS DLLEXPORT
+#endif /* BUILD_tcl */
+
 /*
  * WARNING: This file is automatically generated by the tools/genStubs.tcl
  * script.  Any modifications to the function declarations below should be made
diff --git a/generic/tclMain.c b/generic/tclMain.c
index b98a171..19cf5d5 100644
--- a/generic/tclMain.c
+++ b/generic/tclMain.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclMain.c,v 1.22 2004/03/17 18:14:14 das Exp $
+ * RCS: @(#) $Id: tclMain.c,v 1.23 2004/03/19 18:33:52 kennykb Exp $
  */
 
 #include "tcl.h"
@@ -25,7 +25,7 @@
  * the Tcl source directory to make their own modified versions).
  */
 
-extern int		isatty _ANSI_ARGS_((int fd));
+extern DLLIMPORT int		isatty _ANSI_ARGS_((int fd));
 
 static Tcl_Obj *tclStartupScriptPath = NULL;
 static Tcl_Obj *tclStartupScriptEncoding = NULL;
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 8e21743..e2d6056 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclObj.c,v 1.54 2004/01/28 23:56:59 dkf Exp $
+ * RCS: @(#) $Id: tclObj.c,v 1.55 2004/03/19 18:33:52 kennykb Exp $
  */
 
 #include "tclInt.h"
@@ -1592,6 +1592,8 @@ Tcl_GetDoubleFromObj(interp, objPtr, dblPtr)
     if (objPtr->typePtr == &tclDoubleType) {
 	*dblPtr = objPtr->internalRep.doubleValue;
 	return TCL_OK;
+    } else if ( objPtr->typePtr == &tclIntType ) {
+	*dblPtr = objPtr->internalRep.longValue;
     }
 
     result = SetDoubleFromAny(interp, objPtr);
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 3570fe8..9084dc0 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -10,10 +10,10 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinDde.c,v 1.19 2004/02/25 14:12:35 patthoyts Exp $
+ * RCS: @(#) $Id: tclWinDde.c,v 1.20 2004/03/19 18:33:52 kennykb Exp $
  */
 
-#include "tclPort.h"
+#include "tclInt.h"
 #include <dde.h>
 #include <ddeml.h>
 #include <tchar.h>
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index 29534c8..73c46fc 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -11,10 +11,10 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinReg.c,v 1.26 2004/03/04 15:10:42 patthoyts Exp $
+ * RCS: @(#) $Id: tclWinReg.c,v 1.27 2004/03/19 18:33:53 kennykb Exp $
  */
 
-#include <tclPort.h>
+#include <tclInt.h>
 #ifdef _MSC_VER
 #   pragma comment (lib, "advapi32.lib")
 #endif
diff --git a/win/tclWinTime.c b/win/tclWinTime.c
index 1ab09a8..ccb47fe 100644
--- a/win/tclWinTime.c
+++ b/win/tclWinTime.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinTime.c,v 1.22 2004/03/18 18:56:04 rmax Exp $
+ * RCS: @(#) $Id: tclWinTime.c,v 1.23 2004/03/19 18:33:53 kennykb Exp $
  */
 
 #include "tclWinInt.h"
@@ -545,7 +545,7 @@ TclpGetTZName(int dst)
 
 struct tm *
 TclpGetDate(t, useGMT)
-    CONST time_t t;
+    CONST time_t *t;
     int useGMT;
 {
     struct tm *tmPtr;
@@ -570,14 +570,14 @@ TclpGetDate(t, useGMT)
 	  H. Giese, June 2003
 	*/
 #ifdef __BORLANDC__
-	if (t >= SECSPERDAY) {
+	if (*t >= SECSPERDAY) {
 #else
-	if (t >= 0) {
+	if (*t >= 0) {
 #endif
-	    return localtime(tp);
+	    return localtime(t);
 	}
 
-	time = t - timezone;
+	time = *t - timezone;
 	
 	/*
 	 * If we aren't near to overflowing the long, just add the bias and
@@ -585,11 +585,11 @@ TclpGetDate(t, useGMT)
 	 * the result at the end.
 	 */
 
-	if (t < (LONG_MAX - 2 * SECSPERDAY)
-		&& t > (LONG_MIN + 2 * SECSPERDAY)) {
+	if (*t < (LONG_MAX - 2 * SECSPERDAY)
+		&& *t > (LONG_MIN + 2 * SECSPERDAY)) {
 	    tmPtr = ComputeGMT(&time);
 	} else {
-	    tmPtr = ComputeGMT(&t);
+	    tmPtr = ComputeGMT(t);
 
 	    tzset();
 
@@ -625,7 +625,7 @@ TclpGetDate(t, useGMT)
 	    tmPtr->tm_wday = (tmPtr->tm_wday + time) % 7;
 	}
     } else {
-	tmPtr = ComputeGMT(&t);
+	tmPtr = ComputeGMT(t);
     }
     return tmPtr;
 }