1 files changed, 44 insertions, 45 deletions

diff --git a/win/tclWinInt.h b/win/tclWinInt.h
index 2e80afa..a76865d 100644
--- a/win/tclWinInt.h
+++ b/win/tclWinInt.h
@@ -12,12 +12,7 @@
 #ifndef _TCLWININT
 #define _TCLWININT
 
-#ifndef _TCLINT
 #include "tclInt.h"
-#endif
-#ifndef _TCLPORT
-#include "tclPort.h"
-#endif
 
 /*
  * The following specifies how much stack space TclpCheckStackSpace()
@@ -27,11 +22,6 @@
 
 #define TCL_WIN_STACK_THRESHOLD 0x8000
 
-#ifdef BUILD_tcl
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
 /*
  * Some versions of Borland C have a define for the OSVERSIONINFO for
  * Win32s and for NT, but not for Windows 95.
@@ -83,7 +73,7 @@ typedef struct TclWinProcs {
     DWORD (WINAPI *getTempPathProc)(DWORD, WCHAR *);
     BOOL (WINAPI *getVolumeInformationProc)(CONST TCHAR *, WCHAR *, DWORD, 
 	    LPDWORD, LPDWORD, LPDWORD, WCHAR *, DWORD);
-    HINSTANCE (WINAPI *loadLibraryExProc)(const TCHAR *, HANDLE, DWORD);
+    HINSTANCE (WINAPI *loadLibraryExProc)(CONST TCHAR *, HANDLE, DWORD);
     TCHAR (WINAPI *lstrcpyProc)(WCHAR *, CONST TCHAR *);
     BOOL (WINAPI *moveFileProc)(CONST TCHAR *, CONST TCHAR *);
     BOOL (WINAPI *removeDirectoryProc)(CONST TCHAR *);
@@ -103,13 +93,12 @@ typedef struct TclWinProcs {
     BOOL (WINAPI *createHardLinkProc)(CONST TCHAR*, CONST TCHAR*, 
 				      LPSECURITY_ATTRIBUTES);
     
-    INT (__cdecl *utimeProc)(CONST TCHAR*, struct _utimbuf *);
+    /* deleted INT (__cdecl *utimeProc)(CONST TCHAR*, struct _utimbuf *); */
     /* These two are also NULL at start; see comment above */
     HANDLE (WINAPI *findFirstFileExProc)(CONST TCHAR*, UINT,
 					 LPVOID, UINT,
 					 LPVOID, DWORD);
     BOOL (WINAPI *getVolumeNameForVMPProc)(CONST TCHAR*, TCHAR*, DWORD);
-
     DWORD (WINAPI *getLongPathNameProc)(CONST TCHAR*, TCHAR*, DWORD);
     /* 
      * These six are for the security sdk to get correct file
@@ -136,42 +125,57 @@ typedef struct TclWinProcs {
 		    LPDWORD PrivilegeSetLength,
 		    LPDWORD GrantedAccess,
 		    LPBOOL AccessStatus);
-   /*
-    * Unicode console support. WriteConsole and ReadConsole
-    */
-    BOOL (WINAPI *readConsoleProc)(HANDLE hConsoleInput,
-	                           LPVOID lpBuffer,
-	                           DWORD nNumberOfCharsToRead,
-	                           LPDWORD lpNumberOfCharsRead,
-	                           LPVOID lpReserved);
-    BOOL (WINAPI *writeConsoleProc)(HANDLE hConsoleOutput,
-				    const VOID* lpBuffer,
-				    DWORD nNumberOfCharsToWrite,
-				    LPDWORD lpNumberOfCharsWritten,
-				    LPVOID lpReserved);
+    /*
+     * Unicode console support. WriteConsole and ReadConsole
+     */
+    BOOL (WINAPI *readConsoleProc)(
+      HANDLE hConsoleInput,
+      LPVOID lpBuffer,
+      DWORD nNumberOfCharsToRead,
+      LPDWORD lpNumberOfCharsRead,
+      LPVOID lpReserved
+    );
+    BOOL (WINAPI *writeConsoleProc)(
+      HANDLE hConsoleOutput,
+      const VOID* lpBuffer,
+      DWORD nNumberOfCharsToWrite,
+      LPDWORD lpNumberOfCharsWritten,
+      LPVOID lpReserved
+    );
+    BOOL (WINAPI *getUserName)(LPTSTR lpBuffer, LPDWORD lpnSize);
 } TclWinProcs;
 
-EXTERN TclWinProcs *tclWinProcs;
+MODULE_SCOPE TclWinProcs *tclWinProcs;
 
 /*
  * Declarations of functions that are not accessible by way of the
  * stubs table.
  */
 
-EXTERN void		TclWinEncodingsCleanup();
-EXTERN void		TclWinResetInterfaceEncodings();
-EXTERN void		TclWinInit(HINSTANCE hInst);
-EXTERN int              TclWinSymLinkCopyDirectory(CONST TCHAR* LinkOriginal,
-						   CONST TCHAR* LinkCopy);
-EXTERN int              TclWinSymLinkDelete(CONST TCHAR* LinkOriginal, 
-					    int linkOnly);
-EXTERN char TclWinDriveLetterForVolMountPoint(CONST WCHAR *mountPoint);
+MODULE_SCOPE char	TclWinDriveLetterForVolMountPoint(
+			    CONST WCHAR *mountPoint);
+MODULE_SCOPE void	TclWinEncodingsCleanup();
+MODULE_SCOPE void	TclWinInit(HINSTANCE hInst);
+MODULE_SCOPE TclFile	TclWinMakeFile(HANDLE handle);
+MODULE_SCOPE Tcl_Channel TclWinOpenConsoleChannel(HANDLE handle,
+			    char *channelName, int permissions);
+MODULE_SCOPE Tcl_Channel TclWinOpenFileChannel(HANDLE handle, char *channelName,
+			    int permissions, int appendMode);
+MODULE_SCOPE Tcl_Channel TclWinOpenSerialChannel(HANDLE handle,
+			    char *channelName, int permissions);
+MODULE_SCOPE void	TclWinResetInterfaceEncodings();
+MODULE_SCOPE HANDLE	TclWinSerialReopen(HANDLE handle, CONST TCHAR *name,
+			    DWORD access);
+MODULE_SCOPE int	TclWinSymLinkCopyDirectory(CONST TCHAR* LinkOriginal,
+			    CONST TCHAR* LinkCopy);
+MODULE_SCOPE int	TclWinSymLinkDelete(CONST TCHAR* LinkOriginal, 
+			    int linkOnly);
 #if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC)
-EXTERN void		TclWinFreeAllocCache(void);
-EXTERN void		TclFreeAllocCache(void *);
-EXTERN Tcl_Mutex	*TclpNewAllocMutex(void);
-EXTERN void		*TclpGetAllocCache(void);
-EXTERN void		TclpSetAllocCache(void *);
+MODULE_SCOPE void	TclWinFreeAllocCache(void);
+MODULE_SCOPE void	TclFreeAllocCache(void *);
+MODULE_SCOPE Tcl_Mutex *TclpNewAllocMutex(void);
+MODULE_SCOPE void *	TclpGetAllocCache(void);
+MODULE_SCOPE void	TclpSetAllocCache(void *);
 #endif /* TCL_THREADS */
 
 /* Needed by tclWinFile.c and tclWinFCmd.c */
@@ -179,9 +183,4 @@ EXTERN void		TclpSetAllocCache(void *);
 #define FILE_ATTRIBUTE_REPARSE_POINT 0x00000400
 #endif
 
-#include "tclIntPlatDecls.h"
-
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif	/* _TCLWININT */