summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
Diffstat (limited to 'win')
-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
11 files changed, 28 insertions, 61 deletions
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)
generated by cgit v0.12 at 2024-11-10 16:09:34 (GMT)