Destroy all the TCL_STORAGE_CLASS and associated nonsense.

1 files changed, 60 insertions, 74 deletions

diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index c1531f3..80d6236 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -18,17 +18,6 @@
 #   define DIR void
 #endif
 
-#undef TCL_STORAGE_CLASS
-#ifdef BUILD_tcl
-#   define TCL_STORAGE_CLASS DLLEXPORT
-#else
-#   ifdef USE_TCL_STUBS
-#      define TCL_STORAGE_CLASS
-#   else
-#      define TCL_STORAGE_CLASS DLLIMPORT
-#   endif
-#endif
-
 /*
  * WARNING: This file is automatically generated by the tools/genStubs.tcl
  * script.  Any modifications to the function declarations below should be made
@@ -43,38 +32,38 @@
 
 #if !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(MAC_OSX_TCL) /* UNIX */
 /* 0 */
-EXTERN void		TclGetAndDetachPids(Tcl_Interp *interp,
+TCLAPI void		TclGetAndDetachPids(Tcl_Interp *interp,
 				Tcl_Channel chan);
 /* 1 */
-EXTERN int		TclpCloseFile(TclFile file);
+TCLAPI int		TclpCloseFile(TclFile file);
 /* 2 */
-EXTERN Tcl_Channel	TclpCreateCommandChannel(TclFile readFile,
+TCLAPI Tcl_Channel	TclpCreateCommandChannel(TclFile readFile,
 				TclFile writeFile, TclFile errorFile,
 				int numPids, Tcl_Pid *pidPtr);
 /* 3 */
-EXTERN int		TclpCreatePipe(TclFile *readPipe, TclFile *writePipe);
+TCLAPI int		TclpCreatePipe(TclFile *readPipe, TclFile *writePipe);
 /* 4 */
-EXTERN int		TclpCreateProcess(Tcl_Interp *interp, int argc,
+TCLAPI int		TclpCreateProcess(Tcl_Interp *interp, int argc,
 				const char **argv, TclFile inputFile,
 				TclFile outputFile, TclFile errorFile,
 				Tcl_Pid *pidPtr);
 /* Slot 5 is reserved */
 /* 6 */
-EXTERN TclFile		TclpMakeFile(Tcl_Channel channel, int direction);
+TCLAPI TclFile		TclpMakeFile(Tcl_Channel channel, int direction);
 /* 7 */
-EXTERN TclFile		TclpOpenFile(const char *fname, int mode);
+TCLAPI TclFile		TclpOpenFile(const char *fname, int mode);
 /* 8 */
-EXTERN int		TclUnixWaitForFile(int fd, int mask, int timeout);
+TCLAPI int		TclUnixWaitForFile(int fd, int mask, int timeout);
 /* 9 */
-EXTERN TclFile		TclpCreateTempFile(const char *contents);
+TCLAPI TclFile		TclpCreateTempFile(const char *contents);
 /* 10 */
-EXTERN Tcl_DirEntry *	TclpReaddir(DIR *dir);
+TCLAPI Tcl_DirEntry *	TclpReaddir(DIR *dir);
 /* Slot 11 is reserved */
 /* Slot 12 is reserved */
 /* 13 */
-EXTERN char *		TclpInetNtoa(struct in_addr addr);
+TCLAPI char *		TclpInetNtoa(struct in_addr addr);
 /* 14 */
-EXTERN int		TclUnixCopyFile(const char *src, const char *dst,
+TCLAPI int		TclUnixCopyFile(const char *src, const char *dst,
 				const Tcl_StatBuf *statBufPtr,
 				int dontCopyAtts);
 /* Slot 15 is reserved */
@@ -83,7 +72,7 @@ EXTERN int		TclUnixCopyFile(const char *src, const char *dst,
 /* Slot 18 is reserved */
 /* Slot 19 is reserved */
 /* 20 */
-EXTERN int		TclUnixOpenTemporaryFile(Tcl_Obj *dirObj,
+TCLAPI int		TclUnixOpenTemporaryFile(Tcl_Obj *dirObj,
 				Tcl_Obj *basenameObj, Tcl_Obj *extensionObj,
 				Tcl_Obj *resultingNameObj);
 /* Slot 21 is reserved */
@@ -95,136 +84,136 @@ EXTERN int		TclUnixOpenTemporaryFile(Tcl_Obj *dirObj,
 /* Slot 27 is reserved */
 /* Slot 28 is reserved */
 /* 29 */
-EXTERN int		TclWinCPUID(unsigned int index, unsigned int *regs);
+TCLAPI int		TclWinCPUID(unsigned int index, unsigned int *regs);
 #endif /* UNIX */
 #if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
 /* 0 */
-EXTERN void		TclWinConvertError(DWORD errCode);
+TCLAPI void		TclWinConvertError(DWORD errCode);
 /* Slot 1 is reserved */
 /* 2 */
-EXTERN struct servent *	 TclWinGetServByName(const char *nm,
+TCLAPI struct servent *	 TclWinGetServByName(const char *nm,
 				const char *proto);
 /* 3 */
-EXTERN int		TclWinGetSockOpt(SOCKET s, int level, int optname,
+TCLAPI int		TclWinGetSockOpt(SOCKET s, int level, int optname,
 				char *optval, int *optlen);
 /* 4 */
-EXTERN HINSTANCE	TclWinGetTclInstance(void);
+TCLAPI HINSTANCE	TclWinGetTclInstance(void);
 /* 5 */
-EXTERN int		TclUnixWaitForFile(int fd, int mask, int timeout);
+TCLAPI int		TclUnixWaitForFile(int fd, int mask, int timeout);
 /* 6 */
-EXTERN unsigned short	TclWinNToHS(unsigned short ns);
+TCLAPI unsigned short	TclWinNToHS(unsigned short ns);
 /* 7 */
-EXTERN int		TclWinSetSockOpt(SOCKET s, int level, int optname,
+TCLAPI int		TclWinSetSockOpt(SOCKET s, int level, int optname,
 				const char *optval, int optlen);
 /* 8 */
-EXTERN int		TclpGetPid(Tcl_Pid pid);
+TCLAPI int		TclpGetPid(Tcl_Pid pid);
 /* 9 */
-EXTERN int		TclWinGetPlatformId(void);
+TCLAPI int		TclWinGetPlatformId(void);
 /* 10 */
-EXTERN Tcl_DirEntry *	TclpReaddir(DIR *dir);
+TCLAPI Tcl_DirEntry *	TclpReaddir(DIR *dir);
 /* 11 */
-EXTERN void		TclGetAndDetachPids(Tcl_Interp *interp,
+TCLAPI void		TclGetAndDetachPids(Tcl_Interp *interp,
 				Tcl_Channel chan);
 /* 12 */
-EXTERN int		TclpCloseFile(TclFile file);
+TCLAPI int		TclpCloseFile(TclFile file);
 /* 13 */
-EXTERN Tcl_Channel	TclpCreateCommandChannel(TclFile readFile,
+TCLAPI Tcl_Channel	TclpCreateCommandChannel(TclFile readFile,
 				TclFile writeFile, TclFile errorFile,
 				int numPids, Tcl_Pid *pidPtr);
 /* 14 */
-EXTERN int		TclpCreatePipe(TclFile *readPipe, TclFile *writePipe);
+TCLAPI int		TclpCreatePipe(TclFile *readPipe, TclFile *writePipe);
 /* 15 */
-EXTERN int		TclpCreateProcess(Tcl_Interp *interp, int argc,
+TCLAPI int		TclpCreateProcess(Tcl_Interp *interp, int argc,
 				const char **argv, TclFile inputFile,
 				TclFile outputFile, TclFile errorFile,
 				Tcl_Pid *pidPtr);
 /* 16 */
-EXTERN int		TclpIsAtty(int fd);
+TCLAPI int		TclpIsAtty(int fd);
 /* 17 */
-EXTERN int		TclUnixCopyFile(const char *src, const char *dst,
+TCLAPI int		TclUnixCopyFile(const char *src, const char *dst,
 				const Tcl_StatBuf *statBufPtr,
 				int dontCopyAtts);
 /* 18 */
-EXTERN TclFile		TclpMakeFile(Tcl_Channel channel, int direction);
+TCLAPI TclFile		TclpMakeFile(Tcl_Channel channel, int direction);
 /* 19 */
-EXTERN TclFile		TclpOpenFile(const char *fname, int mode);
+TCLAPI TclFile		TclpOpenFile(const char *fname, int mode);
 /* 20 */
-EXTERN void		TclWinAddProcess(HANDLE hProcess, DWORD id);
+TCLAPI void		TclWinAddProcess(HANDLE hProcess, DWORD id);
 /* 21 */
-EXTERN char *		TclpInetNtoa(struct in_addr addr);
+TCLAPI char *		TclpInetNtoa(struct in_addr addr);
 /* 22 */
-EXTERN TclFile		TclpCreateTempFile(const char *contents);
+TCLAPI TclFile		TclpCreateTempFile(const char *contents);
 /* Slot 23 is reserved */
 /* 24 */
-EXTERN char *		TclWinNoBackslash(char *path);
+TCLAPI char *		TclWinNoBackslash(char *path);
 /* Slot 25 is reserved */
 /* 26 */
-EXTERN void		TclWinSetInterfaces(int wide);
+TCLAPI void		TclWinSetInterfaces(int wide);
 /* 27 */
-EXTERN void		TclWinFlushDirtyChannels(void);
+TCLAPI void		TclWinFlushDirtyChannels(void);
 /* 28 */
-EXTERN void		TclWinResetInterfaces(void);
+TCLAPI void		TclWinResetInterfaces(void);
 /* 29 */
-EXTERN int		TclWinCPUID(unsigned int index, unsigned int *regs);
+TCLAPI int		TclWinCPUID(unsigned int index, unsigned int *regs);
 #endif /* WIN */
 #ifdef MAC_OSX_TCL /* MACOSX */
 /* 0 */
-EXTERN void		TclGetAndDetachPids(Tcl_Interp *interp,
+TCLAPI void		TclGetAndDetachPids(Tcl_Interp *interp,
 				Tcl_Channel chan);
 /* 1 */
-EXTERN int		TclpCloseFile(TclFile file);
+TCLAPI int		TclpCloseFile(TclFile file);
 /* 2 */
-EXTERN Tcl_Channel	TclpCreateCommandChannel(TclFile readFile,
+TCLAPI Tcl_Channel	TclpCreateCommandChannel(TclFile readFile,
 				TclFile writeFile, TclFile errorFile,
 				int numPids, Tcl_Pid *pidPtr);
 /* 3 */
-EXTERN int		TclpCreatePipe(TclFile *readPipe, TclFile *writePipe);
+TCLAPI int		TclpCreatePipe(TclFile *readPipe, TclFile *writePipe);
 /* 4 */
-EXTERN int		TclpCreateProcess(Tcl_Interp *interp, int argc,
+TCLAPI int		TclpCreateProcess(Tcl_Interp *interp, int argc,
 				const char **argv, TclFile inputFile,
 				TclFile outputFile, TclFile errorFile,
 				Tcl_Pid *pidPtr);
 /* Slot 5 is reserved */
 /* 6 */
-EXTERN TclFile		TclpMakeFile(Tcl_Channel channel, int direction);
+TCLAPI TclFile		TclpMakeFile(Tcl_Channel channel, int direction);
 /* 7 */
-EXTERN TclFile		TclpOpenFile(const char *fname, int mode);
+TCLAPI TclFile		TclpOpenFile(const char *fname, int mode);
 /* 8 */
-EXTERN int		TclUnixWaitForFile(int fd, int mask, int timeout);
+TCLAPI int		TclUnixWaitForFile(int fd, int mask, int timeout);
 /* 9 */
-EXTERN TclFile		TclpCreateTempFile(const char *contents);
+TCLAPI TclFile		TclpCreateTempFile(const char *contents);
 /* 10 */
-EXTERN Tcl_DirEntry *	TclpReaddir(DIR *dir);
+TCLAPI Tcl_DirEntry *	TclpReaddir(DIR *dir);
 /* Slot 11 is reserved */
 /* Slot 12 is reserved */
 /* 13 */
-EXTERN char *		TclpInetNtoa(struct in_addr addr);
+TCLAPI char *		TclpInetNtoa(struct in_addr addr);
 /* 14 */
-EXTERN int		TclUnixCopyFile(const char *src, const char *dst,
+TCLAPI int		TclUnixCopyFile(const char *src, const char *dst,
 				const Tcl_StatBuf *statBufPtr,
 				int dontCopyAtts);
 /* 15 */
-EXTERN int		TclMacOSXGetFileAttribute(Tcl_Interp *interp,
+TCLAPI int		TclMacOSXGetFileAttribute(Tcl_Interp *interp,
 				int objIndex, Tcl_Obj *fileName,
 				Tcl_Obj **attributePtrPtr);
 /* 16 */
-EXTERN int		TclMacOSXSetFileAttribute(Tcl_Interp *interp,
+TCLAPI int		TclMacOSXSetFileAttribute(Tcl_Interp *interp,
 				int objIndex, Tcl_Obj *fileName,
 				Tcl_Obj *attributePtr);
 /* 17 */
-EXTERN int		TclMacOSXCopyFileAttributes(const char *src,
+TCLAPI int		TclMacOSXCopyFileAttributes(const char *src,
 				const char *dst,
 				const Tcl_StatBuf *statBufPtr);
 /* 18 */
-EXTERN int		TclMacOSXMatchType(Tcl_Interp *interp,
+TCLAPI int		TclMacOSXMatchType(Tcl_Interp *interp,
 				const char *pathName, const char *fileName,
 				Tcl_StatBuf *statBufPtr,
 				Tcl_GlobTypeData *types);
 /* 19 */
-EXTERN void		TclMacOSXNotifierAddRunLoopMode(
+TCLAPI void		TclMacOSXNotifierAddRunLoopMode(
 				const void *runLoopMode);
 /* 20 */
-EXTERN int		TclUnixOpenTemporaryFile(Tcl_Obj *dirObj,
+TCLAPI int		TclUnixOpenTemporaryFile(Tcl_Obj *dirObj,
 				Tcl_Obj *basenameObj, Tcl_Obj *extensionObj,
 				Tcl_Obj *resultingNameObj);
 /* Slot 21 is reserved */
@@ -236,7 +225,7 @@ EXTERN int		TclUnixOpenTemporaryFile(Tcl_Obj *dirObj,
 /* Slot 27 is reserved */
 /* Slot 28 is reserved */
 /* 29 */
-EXTERN int		TclWinCPUID(unsigned int index, unsigned int *regs);
+TCLAPI int		TclWinCPUID(unsigned int index, unsigned int *regs);
 #endif /* MACOSX */
 
 typedef struct TclIntPlatStubs {
@@ -516,9 +505,6 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr;
 
 /* !END!: Do not edit above this line. */
 
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLIMPORT
-
 #if defined(__WIN32__) || defined(__CYGWIN__)
 #   undef TclWinNToHS
 #   define TclWinNToHS ntohs