summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2004-04-06 22:25:46 (GMT)
committerdgp <dgp@users.sourceforge.net>2004-04-06 22:25:46 (GMT)
commitda705965dccc8a0dd3cb919814226e0c4ec0385c (patch)
treef364fcb944511bb8790be7882532203c0195be6b
parent7bf9dfccb2afbac70ebc42a88d57741b4a2df416 (diff)
downloadtcl-da705965dccc8a0dd3cb919814226e0c4ec0385c.zip
tcl-da705965dccc8a0dd3cb919814226e0c4ec0385c.tar.gz
tcl-da705965dccc8a0dd3cb919814226e0c4ec0385c.tar.bz2
Patch 922727 committed. Implements three changes:
* generic/tclInt.h: Reworked the Tcl header files into a clean * unix/tclUnixPort.h: hierarchy where tcl.h < tclPort.h < tclInt.h * win/tclWinInt.h: and every C source file should #include * win/tclWinPort.h: at most one of those files to satisfy its declaration needs. tclWinInt.h and tclWinPort.h also better organized so that tclWinPort.h includes the Windows implementation of cross-platform declarations, while tclWinInt.h makes declarations that are available on Windows only. * generic/tclBinary.c (TCL_NO_MATH): Deleted the generic/tclMath.h * generic/tclMath.h (removed): header file. The internal Tcl * macosx/Makefile (PRIVATE_HEADERS): header, tclInt.h, has a * win/tcl.dsp: #include <math.h> directly, and file external to Tcl needing libm should do the same. * win/Makefile.in (WIN_OBJS): Deleted the win/tclWinMtherr.c file. * win/makefile.bc (TCLOBJS): It's a vestige from matherr() days * win/makefile.vc (TCLOBJS): gone by. * win/tcl.dsp: * win/tclWinMtherr.c (removed):
-rw-r--r--ChangeLog25
-rw-r--r--compat/gettod.c3
-rw-r--r--compat/memcmp.c1
-rw-r--r--compat/opendir.c3
-rw-r--r--compat/strftime.c5
-rw-r--r--compat/strstr.c4
-rw-r--r--compat/strtod.c3
-rw-r--r--compat/strtol.c3
-rw-r--r--compat/strtoll.c3
-rw-r--r--compat/strtoul.c3
-rw-r--r--compat/strtoull.c3
-rw-r--r--compat/waitpid.c3
-rw-r--r--generic/tclAlloc.c3
-rw-r--r--generic/tclAsync.c3
-rw-r--r--generic/tclBasic.c5
-rw-r--r--generic/tclBinary.c8
-rw-r--r--generic/tclCkalloc.c3
-rw-r--r--generic/tclClock.c4
-rw-r--r--generic/tclCmdAH.c3
-rw-r--r--generic/tclCmdIL.c3
-rw-r--r--generic/tclCmdMZ.c3
-rw-r--r--generic/tclCompExpr.c6
-rw-r--r--generic/tclDate.c1
-rw-r--r--generic/tclEncoding.c3
-rw-r--r--generic/tclEnv.c3
-rw-r--r--generic/tclEvent.c3
-rw-r--r--generic/tclExecute.c8
-rw-r--r--generic/tclFCmd.c3
-rw-r--r--generic/tclFileName.c3
-rw-r--r--generic/tclGet.c5
-rw-r--r--generic/tclHash.c3
-rw-r--r--generic/tclHistory.c3
-rw-r--r--generic/tclIO.c3
-rw-r--r--generic/tclIOCmd.c3
-rw-r--r--generic/tclIOGT.c3
-rw-r--r--generic/tclIOSock.c3
-rw-r--r--generic/tclIOUtil.c4
-rw-r--r--generic/tclIndexObj.c3
-rw-r--r--generic/tclInt.h4
-rw-r--r--generic/tclInterp.c3
-rw-r--r--generic/tclLiteral.c3
-rw-r--r--generic/tclMain.c3
-rw-r--r--generic/tclNotify.c3
-rw-r--r--generic/tclObj.c3
-rw-r--r--generic/tclPanic.c3
-rw-r--r--generic/tclParse.c3
-rw-r--r--generic/tclParseExpr.c6
-rw-r--r--generic/tclPathObj.c3
-rw-r--r--generic/tclPipe.c3
-rw-r--r--generic/tclPosixStr.c3
-rw-r--r--generic/tclRegexp.c3
-rw-r--r--generic/tclScan.c6
-rw-r--r--generic/tclStubInit.c3
-rw-r--r--generic/tclStubLib.c3
-rw-r--r--generic/tclTest.c3
-rwxr-xr-xgeneric/tclThreadAlloc.c6
-rw-r--r--generic/tclTimer.c3
-rw-r--r--generic/tclUtil.c3
-rw-r--r--generic/tclVar.c3
-rw-r--r--macosx/Makefile4
-rw-r--r--macosx/tclMacOSXFCmd.c3
-rw-r--r--unix/tclLoadDyld.c3
-rw-r--r--unix/tclUnixChan.c3
-rw-r--r--unix/tclUnixEvent.c3
-rw-r--r--unix/tclUnixFCmd.c3
-rw-r--r--unix/tclUnixFile.c3
-rw-r--r--unix/tclUnixInit.c3
-rw-r--r--unix/tclUnixNotfy.c3
-rw-r--r--unix/tclUnixPipe.c3
-rw-r--r--unix/tclUnixPort.h9
-rw-r--r--unix/tclUnixSock.c3
-rw-r--r--unix/tclUnixTest.c3
-rw-r--r--unix/tclUnixThrd.c1
-rw-r--r--unix/tclUnixTime.c3
-rw-r--r--unix/tclXtNotify.c4
-rw-r--r--win/Makefile.in3
-rw-r--r--win/makefile.bc1
-rw-r--r--win/makefile.vc3
-rw-r--r--win/tcl.dsp8
-rw-r--r--win/tclWinError.c4
-rw-r--r--win/tclWinInt.h27
-rw-r--r--win/tclWinNotify.c4
-rw-r--r--win/tclWinPort.h27
-rw-r--r--win/tclWinReg.c4
-rw-r--r--win/tclWinTest.c4
-rw-r--r--win/tclWinTime.c4
86 files changed, 142 insertions, 228 deletions
diff --git a/ChangeLog b/ChangeLog
index 91e7cde..bb4cb6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,30 @@
2004-04-06 Don Porter <dgp@users.sourceforge.net>
+ Patch 922727 committed. Implements three changes:
+
+ * generic/tclInt.h: Reworked the Tcl header files into a clean
+ * unix/tclUnixPort.h: hierarchy where tcl.h < tclPort.h < tclInt.h
+ * win/tclWinInt.h: and every C source file should #include
+ * win/tclWinPort.h: at most one of those files to satisfy its
+ declaration needs. tclWinInt.h and tclWinPort.h also better organized
+ so that tclWinPort.h includes the Windows implementation of
+ cross-platform declarations, while tclWinInt.h makes declarations that
+ are available on Windows only.
+
+ * generic/tclBinary.c (TCL_NO_MATH): Deleted the generic/tclMath.h
+ * generic/tclMath.h (removed): header file. The internal Tcl
+ * macosx/Makefile (PRIVATE_HEADERS): header, tclInt.h, has a
+ * win/tcl.dsp: #include <math.h> directly,
+ and file external to Tcl needing libm should do the same.
+
+ * win/Makefile.in (WIN_OBJS): Deleted the win/tclWinMtherr.c file.
+ * win/makefile.bc (TCLOBJS): It's a vestige from matherr() days
+ * win/makefile.vc (TCLOBJS): gone by.
+ * win/tcl.dsp:
+ * win/tclWinMtherr.c (removed):
+
+ End Patch 922727.
+
* tests/unixInit.test (unixInit-3.1): Default encoding on Darwin
systems is utf-8. Thanks to Steven Abner (tauvan). [Bug 928808]
diff --git a/compat/gettod.c b/compat/gettod.c
index 9fc0ca5..98758e6 100644
--- a/compat/gettod.c
+++ b/compat/gettod.c
@@ -9,10 +9,9 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: gettod.c,v 1.2 1998/09/14 18:39:44 stanton Exp $
+ * RCS: @(#) $Id: gettod.c,v 1.3 2004/04/06 22:25:47 dgp Exp $
*/
-#include "tcl.h"
#include "tclPort.h"
#include <sys/timeb.h>
diff --git a/compat/memcmp.c b/compat/memcmp.c
index 09a5724..68e18c5 100644
--- a/compat/memcmp.c
+++ b/compat/memcmp.c
@@ -11,7 +11,6 @@
* SCCS: @(#) memcmp.c 1.2 98/01/19 10:48:58
*/
-#include "tcl.h"
#include "tclPort.h"
/*
diff --git a/compat/opendir.c b/compat/opendir.c
index 8eec7db..0b97156 100644
--- a/compat/opendir.c
+++ b/compat/opendir.c
@@ -7,11 +7,10 @@
* originally from Larry Wall.
*
*
- * RCS: @(#) $Id: opendir.c,v 1.2 1998/09/14 18:39:44 stanton Exp $
+ * RCS: @(#) $Id: opendir.c,v 1.3 2004/04/06 22:25:48 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
#undef DIRSIZ
#define DIRSIZ(dp) \
diff --git a/compat/strftime.c b/compat/strftime.c
index 6bce830..9828e79 100644
--- a/compat/strftime.c
+++ b/compat/strftime.c
@@ -10,7 +10,7 @@
*
* Changes 2002 Copyright (c) 2002 ActiveState Corporation.
*
- * RCS: @(#) $Id: strftime.c,v 1.14 2003/08/27 19:31:00 davygrvy Exp $
+ * RCS: @(#) $Id: strftime.c,v 1.15 2004/04/06 22:25:48 dgp Exp $
*/
/*
@@ -47,14 +47,13 @@
*/
#if defined(LIBC_SCCS)
-static char *rcsid = "$Id: strftime.c,v 1.14 2003/08/27 19:31:00 davygrvy Exp $";
+static char *rcsid = "$Id: strftime.c,v 1.15 2004/04/06 22:25:48 dgp Exp $";
#endif /* LIBC_SCCS */
#include <time.h>
#include <string.h>
#include <locale.h>
#include "tclInt.h"
-#include "tclPort.h"
#define TM_YEAR_BASE 1900
#define IsLeapYear(x) ((x % 4 == 0) && (x % 100 != 0 || x % 400 == 0))
diff --git a/compat/strstr.c b/compat/strstr.c
index c83c209..d1f8516 100644
--- a/compat/strstr.c
+++ b/compat/strstr.c
@@ -9,9 +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: strstr.c,v 1.3 2002/01/26 01:10:08 dgp Exp $
+ * RCS: @(#) $Id: strstr.c,v 1.4 2004/04/06 22:25:48 dgp Exp $
*/
+#include "tcl.h"
+
/*
*----------------------------------------------------------------------
*
diff --git a/compat/strtod.c b/compat/strtod.c
index 063e175..b75d72e 100644
--- a/compat/strtod.c
+++ b/compat/strtod.c
@@ -9,11 +9,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: strtod.c,v 1.6 2002/02/25 14:26:12 dgp Exp $
+ * RCS: @(#) $Id: strtod.c,v 1.7 2004/04/06 22:25:48 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
#include <ctype.h>
#ifndef TRUE
diff --git a/compat/strtol.c b/compat/strtol.c
index 78b0d59..b91e7d0 100644
--- a/compat/strtol.c
+++ b/compat/strtol.c
@@ -9,12 +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: strtol.c,v 1.4 2002/02/25 16:23:26 dgp Exp $
+ * RCS: @(#) $Id: strtol.c,v 1.5 2004/04/06 22:25:48 dgp Exp $
*/
#include <ctype.h>
#include "tclInt.h"
-#include "tclPort.h"
/*
diff --git a/compat/strtoll.c b/compat/strtoll.c
index a28ffea..7d10eb4 100644
--- a/compat/strtoll.c
+++ b/compat/strtoll.c
@@ -9,10 +9,9 @@
* 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.6 2004/03/19 18:33:51 kennykb Exp $
+ * RCS: @(#) $Id: strtoll.c,v 1.7 2004/04/06 22:25:48 dgp Exp $
*/
-#include "tcl.h"
#include "tclInt.h"
#include <ctype.h>
diff --git a/compat/strtoul.c b/compat/strtoul.c
index 912e252..92637e1 100644
--- a/compat/strtoul.c
+++ b/compat/strtoul.c
@@ -9,11 +9,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: strtoul.c,v 1.5 2002/02/25 10:36:32 dkf Exp $
+ * RCS: @(#) $Id: strtoul.c,v 1.6 2004/04/06 22:25:48 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
/*
* The table below is used to convert from ASCII digits to a
diff --git a/compat/strtoull.c b/compat/strtoull.c
index 654173c..f46e78f 100644
--- a/compat/strtoull.c
+++ b/compat/strtoull.c
@@ -9,10 +9,9 @@
* 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.6 2004/03/19 18:33:52 kennykb Exp $
+ * RCS: @(#) $Id: strtoull.c,v 1.7 2004/04/06 22:25:48 dgp Exp $
*/
-#include "tcl.h"
#include "tclInt.h"
#include <ctype.h>
diff --git a/compat/waitpid.c b/compat/waitpid.c
index 00113cf..365d51e 100644
--- a/compat/waitpid.c
+++ b/compat/waitpid.c
@@ -12,10 +12,9 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: waitpid.c,v 1.3 2000/01/11 22:08:50 hobbs Exp $
+ * RCS: @(#) $Id: waitpid.c,v 1.4 2004/04/06 22:25:48 dgp Exp $
*/
-#include "tclInt.h"
#include "tclPort.h"
#ifndef pid_t
diff --git a/generic/tclAlloc.c b/generic/tclAlloc.c
index f4be2ad..aeb0cc8 100644
--- a/generic/tclAlloc.c
+++ b/generic/tclAlloc.c
@@ -15,7 +15,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclAlloc.c,v 1.18 2004/03/17 18:14:13 das Exp $
+ * RCS: @(#) $Id: tclAlloc.c,v 1.19 2004/04/06 22:25:48 dgp Exp $
*/
/*
@@ -26,7 +26,6 @@
#if !defined(TCL_THREADS) || !defined(USE_THREAD_ALLOC)
#include "tclInt.h"
-#include "tclPort.h"
#if USE_TCLALLOC
diff --git a/generic/tclAsync.c b/generic/tclAsync.c
index 76e3e28..49bebfb 100644
--- a/generic/tclAsync.c
+++ b/generic/tclAsync.c
@@ -12,11 +12,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclAsync.c,v 1.6 2001/08/30 07:50:18 davygrvy Exp $
+ * RCS: @(#) $Id: tclAsync.c,v 1.7 2004/04/06 22:25:48 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
/* Forward declaration */
struct ThreadSpecificData;
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 02710d2..a01f57b 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -13,14 +13,11 @@
* 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.98 2004/03/17 18:14:13 das Exp $
+ * RCS: @(#) $Id: tclBasic.c,v 1.99 2004/04/06 22:25:48 dgp Exp $
*/
#include "tclInt.h"
#include "tclCompile.h"
-#ifndef TCL_GENERIC_ONLY
-# include "tclPort.h"
-#endif
/*
* Static procedures in this file:
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index 9d352c0..a99519a 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -10,12 +10,16 @@
* 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.16 2003/12/24 04:18:18 davygrvy Exp $
+ * RCS: @(#) $Id: tclBinary.c,v 1.17 2004/04/06 22:25:48 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.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/tclCkalloc.c b/generic/tclCkalloc.c
index aada301..794372d 100644
--- a/generic/tclCkalloc.c
+++ b/generic/tclCkalloc.c
@@ -13,11 +13,10 @@
*
* This code contributed by Karl Lehenbauer and Mark Diekhans
*
- * RCS: @(#) $Id: tclCkalloc.c,v 1.20 2003/12/24 04:18:18 davygrvy Exp $
+ * RCS: @(#) $Id: tclCkalloc.c,v 1.21 2004/04/06 22:25:48 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
#define FALSE 0
#define TRUE 1
diff --git a/generic/tclClock.c b/generic/tclClock.c
index 82d4f1f..2105d21 100644
--- a/generic/tclClock.c
+++ b/generic/tclClock.c
@@ -11,12 +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: tclClock.c,v 1.25 2004/03/18 18:50:40 rmax Exp $
+ * RCS: @(#) $Id: tclClock.c,v 1.26 2004/04/06 22:25:48 dgp Exp $
*/
-#include "tcl.h"
#include "tclInt.h"
-#include "tclPort.h"
/*
* The date parsing stuff uses lexx and has tons o statics.
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index ddb36ba..d80e32f 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -11,11 +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: tclCmdAH.c,v 1.43 2004/03/17 18:14:13 das Exp $
+ * RCS: @(#) $Id: tclCmdAH.c,v 1.44 2004/04/06 22:25:48 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
#include <locale.h>
/*
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index e3f42a9..676fa3d 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -15,11 +15,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclCmdIL.c,v 1.61 2004/01/17 00:52:18 dkf Exp $
+ * RCS: @(#) $Id: tclCmdIL.c,v 1.62 2004/04/06 22:25:49 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
#include "tclRegexp.h"
/*
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 7579b4e..0e0bffc 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -15,11 +15,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclCmdMZ.c,v 1.100 2004/01/13 23:37:11 dgp Exp $
+ * RCS: @(#) $Id: tclCmdMZ.c,v 1.101 2004/04/06 22:25:49 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
#include "tclRegexp.h"
/*
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index 1f89603..84e0cac 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.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: tclCompExpr.c,v 1.21 2004/01/12 18:50:15 msofer Exp $
+ * RCS: @(#) $Id: tclCompExpr.c,v 1.22 2004/04/06 22:25:50 dgp Exp $
*/
#include "tclInt.h"
@@ -21,9 +21,7 @@
* the errno from tclExecute.c here.
*/
-#ifndef TCL_GENERIC_ONLY
-#include "tclPort.h"
-#else
+#ifdef TCL_GENERIC_ONLY
#define NO_ERRNO_H
#endif
diff --git a/generic/tclDate.c b/generic/tclDate.c
index bd923f1..17a812d 100644
--- a/generic/tclDate.c
+++ b/generic/tclDate.c
@@ -14,7 +14,6 @@
*/
#include "tclInt.h"
-#include "tclPort.h"
#define EPOCH 1970
#define START_OF_TIME 1902
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index a0b7b7f..8b6a6b0 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -8,11 +8,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclEncoding.c,v 1.17 2003/12/24 04:18:19 davygrvy Exp $
+ * RCS: @(#) $Id: tclEncoding.c,v 1.18 2004/04/06 22:25:50 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
typedef size_t (LengthProc)_ANSI_ARGS_((CONST char *src));
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index f814164..af7ddcd 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -12,11 +12,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclEnv.c,v 1.21 2003/05/14 06:17:49 davygrvy Exp $
+ * RCS: @(#) $Id: tclEnv.c,v 1.22 2004/04/06 22:25:50 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
TCL_DECLARE_MUTEX(envMutex) /* To serialize access to environ */
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 0466db3..f0cbf8b 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -11,11 +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: tclEvent.c,v 1.31 2003/12/24 04:18:19 davygrvy Exp $
+ * RCS: @(#) $Id: tclEvent.c,v 1.32 2004/04/06 22:25:50 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
/*
* The data structure below is used to report background errors. One
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 5a13482..daa560c 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -11,14 +11,14 @@
* 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.123 2004/03/30 19:17:57 msofer Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.124 2004/04/06 22:25:50 dgp Exp $
*/
#include "tclInt.h"
#include "tclCompile.h"
#ifndef TCL_NO_MATH
-# include "tclMath.h"
+# include <math.h>
#endif
/*
@@ -27,9 +27,7 @@
* errno here.
*/
-#ifndef TCL_GENERIC_ONLY
-# include "tclPort.h"
-#else /* TCL_GENERIC_ONLY */
+#ifdef TCL_GENERIC_ONLY
# ifndef NO_FLOAT_H
# include <float.h>
# else /* NO_FLOAT_H */
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index f58d2c0..1c16ef0 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -9,11 +9,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclFCmd.c,v 1.25 2004/03/17 18:14:13 das Exp $
+ * RCS: @(#) $Id: tclFCmd.c,v 1.26 2004/04/06 22:25:51 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
/*
* Declarations for local procedures defined in this file:
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index 60f234d..33f6f52 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -10,11 +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: tclFileName.c,v 1.52 2004/03/30 16:13:57 dgp Exp $
+ * RCS: @(#) $Id: tclFileName.c,v 1.53 2004/04/06 22:25:51 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
#include "tclRegexp.h"
#include "tclFileSystem.h" /* For TclGetPathType() */
diff --git a/generic/tclGet.c b/generic/tclGet.c
index 6819322..1fd6277 100644
--- a/generic/tclGet.c
+++ b/generic/tclGet.c
@@ -11,12 +11,11 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclGet.c,v 1.8 2002/11/19 02:34:49 hobbs Exp $
+ * RCS: @(#) $Id: tclGet.c,v 1.9 2004/04/06 22:25:51 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
-#include "tclMath.h"
+#include <math.h>
/*
diff --git a/generic/tclHash.c b/generic/tclHash.c
index 99502b3..54a6efa 100644
--- a/generic/tclHash.c
+++ b/generic/tclHash.c
@@ -10,11 +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: tclHash.c,v 1.17 2004/03/30 22:27:49 dkf Exp $
+ * RCS: @(#) $Id: tclHash.c,v 1.18 2004/04/06 22:25:51 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
/*
* Prevent macros from clashing with function definitions.
diff --git a/generic/tclHistory.c b/generic/tclHistory.c
index 20ccb7c..90ef855 100644
--- a/generic/tclHistory.c
+++ b/generic/tclHistory.c
@@ -12,11 +12,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclHistory.c,v 1.4 2002/01/16 06:02:34 dgp Exp $
+ * RCS: @(#) $Id: tclHistory.c,v 1.5 2004/04/06 22:25:51 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
/*
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 55db84a..9e33166 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -10,11 +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: tclIO.c,v 1.71 2004/03/09 12:59:04 vincentdarley Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.72 2004/04/06 22:25:51 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
#include "tclIO.h"
#include <assert.h>
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index c2c0a40..1f7cd44 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -8,11 +8,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIOCmd.c,v 1.17 2004/03/17 18:14:13 das Exp $
+ * RCS: @(#) $Id: tclIOCmd.c,v 1.18 2004/04/06 22:25:52 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
/*
* Callback structure for accept callback in a TCP server.
diff --git a/generic/tclIOGT.c b/generic/tclIOGT.c
index 0bc3083..92d405c 100644
--- a/generic/tclIOGT.c
+++ b/generic/tclIOGT.c
@@ -10,11 +10,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * CVS: $Id: tclIOGT.c,v 1.7 2002/05/24 21:19:06 dkf Exp $
+ * CVS: $Id: tclIOGT.c,v 1.8 2004/04/06 22:25:52 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
#include "tclIO.h"
diff --git a/generic/tclIOSock.c b/generic/tclIOSock.c
index 4fa451e..8a1a94c 100644
--- a/generic/tclIOSock.c
+++ b/generic/tclIOSock.c
@@ -8,11 +8,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIOSock.c,v 1.7 2002/07/29 16:54:41 rmax Exp $
+ * RCS: @(#) $Id: tclIOSock.c,v 1.8 2004/04/06 22:25:53 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
/*
*---------------------------------------------------------------------------
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index e82efa5..f44a8f2 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -17,13 +17,11 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIOUtil.c,v 1.98 2004/04/01 11:13:01 vincentdarley Exp $
+ * RCS: @(#) $Id: tclIOUtil.c,v 1.99 2004/04/06 22:25:53 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
#ifdef __WIN32__
-/* for tclWinProcs->useWide */
#include "tclWinInt.h"
#endif
#include "tclFileSystem.h"
diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c
index cf986be..ce1a07e 100644
--- a/generic/tclIndexObj.c
+++ b/generic/tclIndexObj.c
@@ -10,11 +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: tclIndexObj.c,v 1.17 2004/01/13 09:42:57 dkf Exp $
+ * RCS: @(#) $Id: tclIndexObj.c,v 1.18 2004/04/06 22:25:53 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
/*
* Prototypes for procedures defined later in this file:
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 0628c0a..f06642c 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.150 2004/04/02 20:07:06 msofer Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.151 2004/04/06 22:25:53 dgp Exp $
*/
#ifndef _TCLINT
@@ -2322,7 +2322,9 @@ extern Tcl_Mutex tclObjMutex;
(nsPtr)->exportLookupEpoch++; \
}
+#include "tclPort.h"
#include "tclIntDecls.h"
+#include "tclIntPlatDecls.h"
# undef TCL_STORAGE_CLASS
# define TCL_STORAGE_CLASS DLLIMPORT
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 1cf52ea..56ab62b 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -9,11 +9,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclInterp.c,v 1.25 2003/12/24 04:18:20 davygrvy Exp $
+ * RCS: @(#) $Id: tclInterp.c,v 1.26 2004/04/06 22:25:53 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
#include <stdio.h>
/*
diff --git a/generic/tclLiteral.c b/generic/tclLiteral.c
index de41e64..9250413 100644
--- a/generic/tclLiteral.c
+++ b/generic/tclLiteral.c
@@ -12,12 +12,11 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclLiteral.c,v 1.13 2004/03/30 22:27:49 dkf Exp $
+ * RCS: @(#) $Id: tclLiteral.c,v 1.14 2004/04/06 22:25:54 dgp Exp $
*/
#include "tclInt.h"
#include "tclCompile.h"
-#include "tclPort.h"
/*
* When there are this many entries per bucket, on average, rebuild
* a literal's hash table to make it larger.
diff --git a/generic/tclMain.c b/generic/tclMain.c
index 80eb200..b4c144e 100644
--- a/generic/tclMain.c
+++ b/generic/tclMain.c
@@ -10,10 +10,9 @@
* 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.24 2004/03/29 15:47:31 dgp Exp $
+ * RCS: @(#) $Id: tclMain.c,v 1.25 2004/04/06 22:25:54 dgp Exp $
*/
-#include "tcl.h"
#include "tclInt.h"
# undef TCL_STORAGE_CLASS
diff --git a/generic/tclNotify.c b/generic/tclNotify.c
index 3627af9..39a1cac 100644
--- a/generic/tclNotify.c
+++ b/generic/tclNotify.c
@@ -14,11 +14,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclNotify.c,v 1.13 2004/03/17 18:14:14 das Exp $
+ * RCS: @(#) $Id: tclNotify.c,v 1.14 2004/04/06 22:25:54 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
extern TclStubs tclStubs;
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 9d71cfe..4604316 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -11,12 +11,11 @@
* 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.56 2004/03/30 21:34:15 dkf Exp $
+ * RCS: @(#) $Id: tclObj.c,v 1.57 2004/04/06 22:25:54 dgp Exp $
*/
#include "tclInt.h"
#include "tclCompile.h"
-#include "tclPort.h"
/*
* Table of all object types.
diff --git a/generic/tclPanic.c b/generic/tclPanic.c
index 5b9125e..e20d0e4 100644
--- a/generic/tclPanic.c
+++ b/generic/tclPanic.c
@@ -12,11 +12,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclPanic.c,v 1.4 2001/06/17 03:48:19 dgp Exp $
+ * RCS: @(#) $Id: tclPanic.c,v 1.5 2004/04/06 22:25:54 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
/*
* The panicProc variable contains a pointer to an application
diff --git a/generic/tclParse.c b/generic/tclParse.c
index ca6c5a8..0d580b7 100644
--- a/generic/tclParse.c
+++ b/generic/tclParse.c
@@ -13,11 +13,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclParse.c,v 1.35 2004/03/08 16:34:22 dgp Exp $
+ * RCS: @(#) $Id: tclParse.c,v 1.36 2004/04/06 22:25:54 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
/*
* The following table provides parsing information about each possible
diff --git a/generic/tclParseExpr.c b/generic/tclParseExpr.c
index 3a0574e..2a8abec 100644
--- a/generic/tclParseExpr.c
+++ b/generic/tclParseExpr.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclParseExpr.c,v 1.20 2004/03/04 23:25:15 dgp Exp $
+ * RCS: @(#) $Id: tclParseExpr.c,v 1.21 2004/04/06 22:25:54 dgp Exp $
*/
#include "tclInt.h"
@@ -24,9 +24,7 @@
* the errno from tclExecute.c here.
*/
-#ifndef TCL_GENERIC_ONLY
-#include "tclPort.h"
-#else
+#ifdef TCL_GENERIC_ONLY
#define NO_ERRNO_H
#endif
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index a934f3d..daa9297 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -10,11 +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: tclPathObj.c,v 1.28 2004/03/30 09:56:13 vincentdarley Exp $
+ * RCS: @(#) $Id: tclPathObj.c,v 1.29 2004/04/06 22:25:54 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
#include "tclFileSystem.h"
/*
diff --git a/generic/tclPipe.c b/generic/tclPipe.c
index 7d1334d..99a89e1 100644
--- a/generic/tclPipe.c
+++ b/generic/tclPipe.c
@@ -10,11 +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: tclPipe.c,v 1.7 2002/12/17 02:47:39 davygrvy Exp $
+ * RCS: @(#) $Id: tclPipe.c,v 1.8 2004/04/06 22:25:54 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
/*
* A linked list of the following structures is used to keep track
diff --git a/generic/tclPosixStr.c b/generic/tclPosixStr.c
index cc2a546..a3aedf5 100644
--- a/generic/tclPosixStr.c
+++ b/generic/tclPosixStr.c
@@ -11,11 +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: tclPosixStr.c,v 1.9 2002/05/27 10:14:21 dkf Exp $
+ * RCS: @(#) $Id: tclPosixStr.c,v 1.10 2004/04/06 22:25:54 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
/*
*----------------------------------------------------------------------
diff --git a/generic/tclRegexp.c b/generic/tclRegexp.c
index 3722278..3d67fcb 100644
--- a/generic/tclRegexp.c
+++ b/generic/tclRegexp.c
@@ -10,11 +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: tclRegexp.c,v 1.14 2002/01/17 03:03:12 dgp Exp $
+ * RCS: @(#) $Id: tclRegexp.c,v 1.15 2004/04/06 22:25:54 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
#include "tclRegexp.h"
/*
diff --git a/generic/tclScan.c b/generic/tclScan.c
index 7d5b093..2ff616d 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -8,14 +8,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclScan.c,v 1.12 2002/02/25 15:23:02 dkf Exp $
+ * RCS: @(#) $Id: tclScan.c,v 1.13 2004/04/06 22:25:54 dgp Exp $
*/
#include "tclInt.h"
-/*
- * For strtoll() and strtoull() declarations on some platforms...
- */
-#include "tclPort.h"
/*
* Flag values used by Tcl_ScanObjCmd.
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 91be201..bfe26c0 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -8,11 +8,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclStubInit.c,v 1.93 2004/03/17 18:14:14 das Exp $
+ * RCS: @(#) $Id: tclStubInit.c,v 1.94 2004/04/06 22:25:55 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
/*
* Remove macros that will interfere with the definitions below.
diff --git a/generic/tclStubLib.c b/generic/tclStubLib.c
index 91e5cef..f246f35 100644
--- a/generic/tclStubLib.c
+++ b/generic/tclStubLib.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: tclStubLib.c,v 1.7 2004/03/18 18:55:16 rmax Exp $
+ * RCS: @(#) $Id: tclStubLib.c,v 1.8 2004/04/06 22:25:55 dgp Exp $
*/
/*
@@ -26,7 +26,6 @@
#undef USE_TCL_STUB_PROCS
#include "tclInt.h"
-#include "tclPort.h"
/*
* Ensure that Tcl_InitStubs is built as an exported symbol. The other stub
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 93e124f..4867e1c 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -14,12 +14,11 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclTest.c,v 1.80 2004/03/17 18:14:14 das Exp $
+ * RCS: @(#) $Id: tclTest.c,v 1.81 2004/04/06 22:25:55 dgp Exp $
*/
#define TCL_TEST
#include "tclInt.h"
-#include "tclPort.h"
/*
* Required for Testregexp*Cmd
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c
index 1cb7a25..c8498dd 100755
--- a/generic/tclThreadAlloc.c
+++ b/generic/tclThreadAlloc.c
@@ -11,16 +11,14 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclThreadAlloc.c,v 1.8 2003/12/24 04:18:20 davygrvy Exp $
+ * RCS: @(#) $Id: tclThreadAlloc.c,v 1.9 2004/04/06 22:25:55 dgp Exp $
*/
#if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC)
#include "tclInt.h"
-#ifdef WIN32
-#include "tclWinInt.h"
-#else
+#ifndef WIN32
extern Tcl_Mutex *TclpNewAllocMutex(void);
extern void *TclpGetAllocCache(void);
extern void TclpSetAllocCache(void *);
diff --git a/generic/tclTimer.c b/generic/tclTimer.c
index 6d44081..b441ac3 100644
--- a/generic/tclTimer.c
+++ b/generic/tclTimer.c
@@ -9,11 +9,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclTimer.c,v 1.7 2003/12/24 04:18:20 davygrvy Exp $
+ * RCS: @(#) $Id: tclTimer.c,v 1.8 2004/04/06 22:25:55 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
/*
* For each timer callback that's pending there is one record of the following
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 10cddf2..6acc643 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -11,11 +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: tclUtil.c,v 1.43 2003/09/04 16:44:12 dgp Exp $
+ * RCS: @(#) $Id: tclUtil.c,v 1.44 2004/04/06 22:25:55 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
/*
* The following variable holds the full path name of the binary
diff --git a/generic/tclVar.c b/generic/tclVar.c
index e44cd0e..1b3068b 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -15,11 +15,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclVar.c,v 1.77 2003/12/24 04:18:20 davygrvy Exp $
+ * RCS: @(#) $Id: tclVar.c,v 1.78 2004/04/06 22:25:56 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
/*
* The strings below are used to indicate what went wrong when a
diff --git a/macosx/Makefile b/macosx/Makefile
index 0758bae..036bd8a 100644
--- a/macosx/Makefile
+++ b/macosx/Makefile
@@ -3,7 +3,7 @@
# Makefile to build Tcl on Mac OS X packaged as a Framework
# uses standard unix build system in tcl/unix
#
-# RCS: @(#) $Id: Makefile,v 1.12 2004/02/26 09:10:23 das Exp $
+# RCS: @(#) $Id: Makefile,v 1.13 2004/04/06 22:25:56 dgp Exp $
#
########################################################################################################
@@ -94,7 +94,7 @@ PRODUCT_LONGVERSION := $(shell eval $$(grep '^TCL_PATCH_LEVEL=' ${UNIX_DIR}/conf
echo "${PRODUCT_VERSION}$${TCL_PATCH_LEVEL}")
YEAR := $(shell date +%Y)
-PRIVATE_HEADERS := tclInt.h tclIntDecls.h tclIntPlatDecls.h tclMath.h
+PRIVATE_HEADERS := tclInt.h tclIntDecls.h tclIntPlatDecls.h
TARGETS := tclsh tcltest
TCLSH := tclsh${PRODUCT_VERSION}
TCL_EXE ?= ${SYMROOT}/${TCLSH}
diff --git a/macosx/tclMacOSXFCmd.c b/macosx/tclMacOSXFCmd.c
index a1ce49e..0416dac 100644
--- a/macosx/tclMacOSXFCmd.c
+++ b/macosx/tclMacOSXFCmd.c
@@ -9,11 +9,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclMacOSXFCmd.c,v 1.1 2003/05/14 19:21:24 das Exp $
+ * RCS: @(#) $Id: tclMacOSXFCmd.c,v 1.2 2004/04/06 22:25:56 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
#ifdef HAVE_GETATTRLIST
#include <sys/attr.h>
diff --git a/unix/tclLoadDyld.c b/unix/tclLoadDyld.c
index 906cce3..af14fd2 100644
--- a/unix/tclLoadDyld.c
+++ b/unix/tclLoadDyld.c
@@ -11,11 +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: tclLoadDyld.c,v 1.14 2002/10/29 00:04:08 das Exp $
+ * RCS: @(#) $Id: tclLoadDyld.c,v 1.15 2004/04/06 22:25:56 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
#include <mach-o/dyld.h>
typedef struct Tcl_DyldModuleHandle {
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index 4403ced..138188d 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -10,11 +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: tclUnixChan.c,v 1.47 2004/03/18 18:55:44 rmax Exp $
+ * RCS: @(#) $Id: tclUnixChan.c,v 1.48 2004/04/06 22:25:56 dgp Exp $
*/
#include "tclInt.h" /* Internal definitions for Tcl. */
-#include "tclPort.h" /* Portability features for Tcl. */
#include "tclIO.h" /* To get Channel type declaration. */
/*
diff --git a/unix/tclUnixEvent.c b/unix/tclUnixEvent.c
index a623dbb..98ab452 100644
--- a/unix/tclUnixEvent.c
+++ b/unix/tclUnixEvent.c
@@ -8,10 +8,9 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclUnixEvent.c,v 1.4 2001/11/21 02:36:21 hobbs Exp $
+ * RCS: @(#) $Id: tclUnixEvent.c,v 1.5 2004/04/06 22:25:56 dgp Exp $
*/
-#include "tclInt.h"
#include "tclPort.h"
/*
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index 4e2f429..3bc94ca 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.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: tclUnixFCmd.c,v 1.35 2004/03/05 14:06:55 vbwagner Exp $
+ * RCS: @(#) $Id: tclUnixFCmd.c,v 1.36 2004/04/06 22:25:56 dgp Exp $
*
* Portions of this code were derived from NetBSD source code which has
* the following copyright notice:
@@ -48,7 +48,6 @@
*/
#include "tclInt.h"
-#include "tclPort.h"
#include <utime.h>
#include <grp.h>
#ifndef HAVE_ST_BLKSIZE
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index 76ffc32..db8e5b6 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -9,11 +9,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclUnixFile.c,v 1.38 2004/01/29 10:28:23 vincentdarley Exp $
+ * RCS: @(#) $Id: tclUnixFile.c,v 1.39 2004/04/06 22:25:57 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
static int NativeMatchType(CONST char* nativeName, Tcl_GlobTypeData *types);
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index 12a99d4..43f9348 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -7,14 +7,13 @@
* Copyright (c) 1999 by Scriptics Corporation.
* All rights reserved.
*
- * RCS: @(#) $Id: tclUnixInit.c,v 1.39 2004/03/09 13:34:45 vbwagner Exp $
+ * RCS: @(#) $Id: tclUnixInit.c,v 1.40 2004/04/06 22:25:57 dgp Exp $
*/
#if defined(HAVE_CFBUNDLE)
#include <CoreFoundation/CoreFoundation.h>
#endif
#include "tclInt.h"
-#include "tclPort.h"
#include <locale.h>
#ifdef HAVE_LANGINFO
#include <langinfo.h>
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
index 4e8bfb2..679da4d 100644
--- a/unix/tclUnixNotfy.c
+++ b/unix/tclUnixNotfy.c
@@ -11,11 +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: tclUnixNotfy.c,v 1.14 2003/12/24 04:18:22 davygrvy Exp $
+ * RCS: @(#) $Id: tclUnixNotfy.c,v 1.15 2004/04/06 22:25:57 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
#include <signal.h>
extern TclStubs tclStubs;
diff --git a/unix/tclUnixPipe.c b/unix/tclUnixPipe.c
index 4ceb16f..448d19e 100644
--- a/unix/tclUnixPipe.c
+++ b/unix/tclUnixPipe.c
@@ -10,11 +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: tclUnixPipe.c,v 1.23 2003/02/21 14:15:58 das Exp $
+ * RCS: @(#) $Id: tclUnixPipe.c,v 1.24 2004/04/06 22:25:57 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
#ifdef USE_VFORK
#define fork vfork
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index a41ceeb..e1b2fc4 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -19,16 +19,12 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclUnixPort.h,v 1.34 2004/03/09 13:32:26 vbwagner Exp $
+ * RCS: @(#) $Id: tclUnixPort.h,v 1.35 2004/04/06 22:25:57 dgp Exp $
*/
#ifndef _TCLUNIXPORT
#define _TCLUNIXPORT
-#ifndef _TCLINT
-# include "tclInt.h"
-#endif
-
/*
*---------------------------------------------------------------------------
* The following sets of #includes and #ifdefs are required to get Tcl to
@@ -585,7 +581,4 @@ typedef int TclpMutex;
#define TclpMutexUnlock(a)
#endif /* TCL_THREADS */
-#include "tclPlatDecls.h"
-#include "tclIntPlatDecls.h"
-
#endif /* _TCLUNIXPORT */
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 4ab3af9..0189c11 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -8,10 +8,9 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclUnixSock.c,v 1.8 2004/03/19 18:34:02 rmax Exp $
+ * RCS: @(#) $Id: tclUnixSock.c,v 1.9 2004/04/06 22:25:57 dgp Exp $
*/
-#include "tcl.h"
#include "tclInt.h"
/*
diff --git a/unix/tclUnixTest.c b/unix/tclUnixTest.c
index f89b820..880e4fd 100644
--- a/unix/tclUnixTest.c
+++ b/unix/tclUnixTest.c
@@ -9,11 +9,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclUnixTest.c,v 1.15 2003/10/13 00:59:48 hobbs Exp $
+ * RCS: @(#) $Id: tclUnixTest.c,v 1.16 2004/04/06 22:25:57 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
/*
* The headers are needed for the testalarm command that verifies the
diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c
index 98d1edc..f67248c 100644
--- a/unix/tclUnixThrd.c
+++ b/unix/tclUnixThrd.c
@@ -13,7 +13,6 @@
*/
#include "tclInt.h"
-#include "tclPort.h"
#ifdef TCL_THREADS
diff --git a/unix/tclUnixTime.c b/unix/tclUnixTime.c
index aec0185..37c16bc 100644
--- a/unix/tclUnixTime.c
+++ b/unix/tclUnixTime.c
@@ -9,11 +9,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclUnixTime.c,v 1.19 2004/03/18 18:55:55 rmax Exp $
+ * RCS: @(#) $Id: tclUnixTime.c,v 1.20 2004/04/06 22:25:57 dgp Exp $
*/
#include "tclInt.h"
-#include "tclPort.h"
#include <locale.h>
#define TM_YEAR_BASE 1900
#define IsLeapYear(x) ((x % 4 == 0) && (x % 100 != 0 || x % 400 == 0))
diff --git a/unix/tclXtNotify.c b/unix/tclXtNotify.c
index 5b186bd..0d13d15 100644
--- a/unix/tclXtNotify.c
+++ b/unix/tclXtNotify.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: tclXtNotify.c,v 1.5 2003/12/24 04:18:22 davygrvy Exp $
+ * RCS: @(#) $Id: tclXtNotify.c,v 1.6 2004/04/06 22:25:57 dgp Exp $
*/
#include <X11/Intrinsic.h>
-#include <tclInt.h>
+#include "tclInt.h"
/*
* This structure is used to keep track of the notifier info for a
diff --git a/win/Makefile.in b/win/Makefile.in
index 97dd08f..89029f6 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.75 2003/11/10 22:55:47 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.76 2004/04/06 22:25:57 dgp Exp $
VERSION = @TCL_VERSION@
@@ -281,7 +281,6 @@ WIN_OBJS = \
tclWinFile.$(OBJEXT) \
tclWinInit.$(OBJEXT) \
tclWinLoad.$(OBJEXT) \
- tclWinMtherr.$(OBJEXT) \
tclWinNotify.$(OBJEXT) \
tclWinPipe.$(OBJEXT) \
tclWinSock.$(OBJEXT) \
diff --git a/win/makefile.bc b/win/makefile.bc
index 7814623..e627f4e 100644
--- a/win/makefile.bc
+++ b/win/makefile.bc
@@ -267,7 +267,6 @@ TCLOBJS = \
$(TMPDIR)\tclWinFile.obj \
$(TMPDIR)\tclWinInit.obj \
$(TMPDIR)\tclWinLoad.obj \
- $(TMPDIR)\tclWinMtherr.obj \
$(TMPDIR)\tclWinNotify.obj \
$(TMPDIR)\tclWinPipe.obj \
$(TMPDIR)\tclWinSock.obj \
diff --git a/win/makefile.vc b/win/makefile.vc
index 35bafe2..3956dc6 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
# Copyright (c) 2001-2004 David Gravereaux.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.124 2004/03/03 10:47:22 davygrvy Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.125 2004/04/06 22:25:57 dgp Exp $
#------------------------------------------------------------------------------
!if "$(MSDEVDIR)" == ""
@@ -322,7 +322,6 @@ TCLOBJS = \
$(TMP_DIR)\tclWinFile.obj \
$(TMP_DIR)\tclWinInit.obj \
$(TMP_DIR)\tclWinLoad.obj \
- $(TMP_DIR)\tclWinMtherr.obj \
$(TMP_DIR)\tclWinNotify.obj \
$(TMP_DIR)\tclWinPipe.obj \
$(TMP_DIR)\tclWinSock.obj \
diff --git a/win/tcl.dsp b/win/tcl.dsp
index d5e8489..84ea5bc 100644
--- a/win/tcl.dsp
+++ b/win/tcl.dsp
@@ -1232,10 +1232,6 @@ SOURCE=..\generic\tclMain.c
# End Source File
# Begin Source File
-SOURCE=..\generic\tclMath.h
-# End Source File
-# Begin Source File
-
SOURCE=..\generic\tclNamesp.c
# End Source File
# Begin Source File
@@ -1544,10 +1540,6 @@ SOURCE=.\tclWinLoad.c
# End Source File
# Begin Source File
-SOURCE=.\tclWinMtherr.c
-# End Source File
-# Begin Source File
-
SOURCE=.\tclWinNotify.c
# End Source File
# Begin Source File
diff --git a/win/tclWinError.c b/win/tclWinError.c
index e70e1c2..9a504d2 100644
--- a/win/tclWinError.c
+++ b/win/tclWinError.c
@@ -9,10 +9,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinError.c,v 1.5 2002/05/27 10:14:21 dkf Exp $
+ * RCS: @(#) $Id: tclWinError.c,v 1.6 2004/04/06 22:25:58 dgp Exp $
*/
-#include "tclWinInt.h"
+#include "tclInt.h"
/*
* The following table contains the mapping from Win32 errors to
diff --git a/win/tclWinInt.h b/win/tclWinInt.h
index 5c9ce70..7dda96d 100644
--- a/win/tclWinInt.h
+++ b/win/tclWinInt.h
@@ -8,18 +8,13 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinInt.h,v 1.24 2004/01/21 19:59:34 vincentdarley Exp $
+ * RCS: @(#) $Id: tclWinInt.h,v 1.25 2004/04/06 22:25:58 dgp Exp $
*/
#ifndef _TCLWININT
#define _TCLWININT
-#ifndef _TCLINT
#include "tclInt.h"
-#endif
-#ifndef _TCLPORT
-#include "tclPort.h"
-#endif
/*
* The following specifies how much stack space TclpCheckStackSpace()
@@ -146,14 +141,24 @@ EXTERN TclWinProcs *tclWinProcs;
* stubs table.
*/
+EXTERN char TclWinDriveLetterForVolMountPoint(
+ CONST WCHAR *mountPoint);
EXTERN void TclWinEncodingsCleanup();
-EXTERN void TclWinResetInterfaceEncodings();
EXTERN void TclWinInit(HINSTANCE hInst);
+EXTERN TclFile TclWinMakeFile(HANDLE handle);
+EXTERN Tcl_Channel TclWinOpenConsoleChannel(HANDLE handle,
+ char *channelName, int permissions);
+EXTERN Tcl_Channel TclWinOpenFileChannel(HANDLE handle, char *channelName,
+ int permissions, int appendMode);
+EXTERN Tcl_Channel TclWinOpenSerialChannel(HANDLE handle,
+ char *channelName, int permissions);
+EXTERN void TclWinResetInterfaceEncodings();
+EXTERN HANDLE TclWinSerialReopen(HANDLE handle, CONST TCHAR *name,
+ DWORD access);
EXTERN int TclWinSymLinkCopyDirectory(CONST TCHAR* LinkOriginal,
- CONST TCHAR* LinkCopy);
+ CONST TCHAR* LinkCopy);
EXTERN int TclWinSymLinkDelete(CONST TCHAR* LinkOriginal,
- int linkOnly);
-EXTERN char TclWinDriveLetterForVolMountPoint(CONST WCHAR *mountPoint);
+ int linkOnly);
#if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC)
EXTERN void TclWinFreeAllocCache(void);
EXTERN void TclFreeAllocCache(void *);
@@ -167,8 +172,6 @@ EXTERN void TclpSetAllocCache(void *);
#define FILE_ATTRIBUTE_REPARSE_POINT 0x00000400
#endif
-#include "tclIntPlatDecls.h"
-
# undef TCL_STORAGE_CLASS
# define TCL_STORAGE_CLASS DLLIMPORT
diff --git a/win/tclWinNotify.c b/win/tclWinNotify.c
index d06289d..3bcfd2b 100644
--- a/win/tclWinNotify.c
+++ b/win/tclWinNotify.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: tclWinNotify.c,v 1.15 2004/03/16 03:40:36 davygrvy Exp $
+ * RCS: @(#) $Id: tclWinNotify.c,v 1.16 2004/04/06 22:25:58 dgp Exp $
*/
-#include "tclWinInt.h"
+#include "tclInt.h"
/*
* The follwing static indicates whether this module has been initialized.
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index dd36806..3e6364e 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -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: tclWinPort.h,v 1.39 2004/03/05 21:27:46 mdejong Exp $
+ * RCS: @(#) $Id: tclWinPort.h,v 1.40 2004/04/06 22:25:58 dgp Exp $
*/
#ifndef _TCLWINPORT
#define _TCLWINPORT
-#ifndef _TCLINT
-# include "tclInt.h"
-#endif
-
#ifdef CHECK_UNICODE_CALLS
# define _UNICODE
# define UNICODE
@@ -499,24 +495,6 @@
#define TclpExit exit
/*
- * Declarations for Windows-only functions.
- */
-
-EXTERN HANDLE TclWinSerialReopen _ANSI_ARGS_(( HANDLE handle,
- CONST TCHAR *name, DWORD access));
-
-EXTERN Tcl_Channel TclWinOpenSerialChannel _ANSI_ARGS_((HANDLE handle,
- char *channelName, int permissions));
-
-EXTERN Tcl_Channel TclWinOpenConsoleChannel _ANSI_ARGS_((HANDLE handle,
- char *channelName, int permissions));
-
-EXTERN Tcl_Channel TclWinOpenFileChannel _ANSI_ARGS_((HANDLE handle,
- char *channelName, int permissions, int appendMode));
-
-EXTERN TclFile TclWinMakeFile _ANSI_ARGS_((HANDLE handle));
-
-/*
* Platform specific mutex definition used by memory allocators.
* These mutexes are statically allocated and explicitly initialized.
* Most modules do not use this, but instead use Tcl_Mutex types and
@@ -546,9 +524,6 @@ EXTERN Tcl_WideUInt strtoull _ANSI_ARGS_((CONST char *string,
#define INVALID_SET_FILE_POINTER 0xFFFFFFFF
#endif /* INVALID_SET_FILE_POINTER */
-#include "tclPlatDecls.h"
-#include "tclIntPlatDecls.h"
-
#undef TCL_STORAGE_CLASS
#define TCL_STORAGE_CLASS DLLIMPORT
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index 73c46fc..61be3d2 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.27 2004/03/19 18:33:53 kennykb Exp $
+ * RCS: @(#) $Id: tclWinReg.c,v 1.28 2004/04/06 22:25:58 dgp Exp $
*/
-#include <tclInt.h>
+#include "tclInt.h"
#ifdef _MSC_VER
# pragma comment (lib, "advapi32.lib")
#endif
diff --git a/win/tclWinTest.c b/win/tclWinTest.c
index 63775f3..ede007d 100644
--- a/win/tclWinTest.c
+++ b/win/tclWinTest.c
@@ -8,11 +8,11 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinTest.c,v 1.9 2003/04/12 19:08:55 kennykb Exp $
+ * RCS: @(#) $Id: tclWinTest.c,v 1.10 2004/04/06 22:25:58 dgp Exp $
*/
#define USE_COMPAT_CONST
-#include "tclWinInt.h"
+#include "tclInt.h"
/*
* Forward declarations of procedures defined later in this file:
diff --git a/win/tclWinTime.c b/win/tclWinTime.c
index ccb47fe..931f906 100644
--- a/win/tclWinTime.c
+++ b/win/tclWinTime.c
@@ -9,10 +9,10 @@
* 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.23 2004/03/19 18:33:53 kennykb Exp $
+ * RCS: @(#) $Id: tclWinTime.c,v 1.24 2004/04/06 22:25:58 dgp Exp $
*/
-#include "tclWinInt.h"
+#include "tclInt.h"
#define SECSPERDAY (60L * 60L * 24L)
#define SECSPERYEAR (SECSPERDAY * 365L)