* win/tclWinInt.h:

* win/tclWinPort.h: exported internals dropped by a count of 14.

2 files changed, 31 insertions, 44 deletions

diff --git a/win/tclWinInt.h b/win/tclWinInt.h
index 3efc16b..d7f4a70 100644
--- a/win/tclWinInt.h
+++ b/win/tclWinInt.h
@@ -8,7 +8,7 @@
  * 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.27 2004/11/01 16:58:38 kennykb Exp $
+ * RCS: @(#) $Id: tclWinInt.h,v 1.28 2004/11/03 00:26:59 davygrvy Exp $
  */
 
 #ifndef _TCLWININT
@@ -24,11 +24,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.
@@ -134,37 +129,37 @@ typedef struct TclWinProcs {
 		    LPBOOL AccessStatus);
 } TclWinProcs;
 
-EXTERN TclWinProcs *tclWinProcs;
+MODULE_SCOPE TclWinProcs *tclWinProcs;
 
 /*
  * Declarations of functions that are not accessible by way of the
  * stubs table.
  */
 
-EXTERN char		TclWinDriveLetterForVolMountPoint(
-				CONST WCHAR *mountPoint);
-EXTERN void		TclWinEncodingsCleanup();
-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);
-EXTERN int              TclWinSymLinkDelete(CONST TCHAR* LinkOriginal, 
-				int linkOnly);
+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 */
@@ -172,7 +167,4 @@ EXTERN void		TclpSetAllocCache(void *);
 #define FILE_ATTRIBUTE_REPARSE_POINT 0x00000400
 #endif
 
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif	/* _TCLWININT */
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 73de9a5..1c3318a 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -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: tclWinPort.h,v 1.41 2004/05/30 21:57:09 davygrvy Exp $
+ * RCS: @(#) $Id: tclWinPort.h,v 1.42 2004/11/03 00:26:59 davygrvy Exp $
  */
 
 #ifndef _TCLWINPORT
@@ -71,11 +71,6 @@
 #define INCL_WINSOCK_API_TYPEDEFS   1
 #include <winsock2.h>
 
-#ifdef BUILD_tcl
-#   undef TCL_STORAGE_CLASS
-#   define TCL_STORAGE_CLASS DLLEXPORT
-#endif /* BUILD_tcl */
-
 /*
  * Define EINPROGRESS in terms of WSAEINPROGRESS.
  */
@@ -515,9 +510,9 @@
 
 #ifdef TCL_THREADS
 typedef CRITICAL_SECTION TclpMutex;
-EXTERN void	TclpMutexInit _ANSI_ARGS_((TclpMutex *mPtr));
-EXTERN void	TclpMutexLock _ANSI_ARGS_((TclpMutex *mPtr));
-EXTERN void	TclpMutexUnlock _ANSI_ARGS_((TclpMutex *mPtr));
+MODULE_SCOPE void	TclpMutexInit _ANSI_ARGS_((TclpMutex *mPtr));
+MODULE_SCOPE void	TclpMutexLock _ANSI_ARGS_((TclpMutex *mPtr));
+MODULE_SCOPE void	TclpMutexUnlock _ANSI_ARGS_((TclpMutex *mPtr));
 #else /* !TCL_THREADS */
 typedef int TclpMutex;
 #define	TclpMutexInit(a)
@@ -526,9 +521,9 @@ typedef int TclpMutex;
 #endif /* TCL_THREADS */
 
 #ifdef TCL_WIDE_INT_TYPE
-EXTERN Tcl_WideInt	strtoll _ANSI_ARGS_((CONST char *string,
+MODULE_SCOPE Tcl_WideInt	strtoll _ANSI_ARGS_((CONST char *string,
 					     char **endPtr, int base));
-EXTERN Tcl_WideUInt	strtoull _ANSI_ARGS_((CONST char *string,
+MODULE_SCOPE Tcl_WideUInt	strtoull _ANSI_ARGS_((CONST char *string,
 					      char **endPtr, int base));
 #endif /* TCL_WIDE_INT_TYPE */