* generic/tcl.h: Moved the preprocessor logic

* generic/tclDecls.h:		from tclInt.h of setting the
* generic/tclInt.h:		TCL_STORAGE_CLASS macro to the
* generic/tclIntDecls.h:	tcl*Decls.h files now that no
* generic/tclIntPlatDecls.h:	use of EXTERN is left in tclInt.h.
* generic/tclPlatDecls.h:	Proto for Tcl_Main moved in tcl.h
* win/tclWinPort.h:		to prior the inclusion of the Stubs
headers as they are now resetting TCL_STORAGE_CLASS.  Removed
extrainious reset from tclWinPort.h.  [Patch 1055668]

6 files changed, 66 insertions, 29 deletions

diff --git a/generic/tcl.h b/generic/tcl.h
index 80eca97..e29ee48 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -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: tcl.h,v 1.186 2004/11/01 09:24:49 dkf Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.187 2004/11/03 19:13:33 davygrvy Exp $
  */
 
 #ifndef _TCL
@@ -2316,6 +2316,13 @@ EXTERN CONST char *	Tcl_InitStubs _ANSI_ARGS_((Tcl_Interp *interp,
 
 #endif
 
+/*
+ * Public functions that are not accessible via the stubs table.
+ */
+
+EXTERN void Tcl_Main _ANSI_ARGS_((int argc, char **argv,
+	Tcl_AppInitProc *appInitProc));
+
 
 /*
  * Include the public function declarations that are accessible via
@@ -2332,13 +2339,6 @@ EXTERN CONST char *	Tcl_InitStubs _ANSI_ARGS_((Tcl_Interp *interp,
 #include "tclPlatDecls.h"
 
 /*
- * Public functions that are not accessible via the stubs table.
- */
-
-EXTERN void Tcl_Main _ANSI_ARGS_((int argc, char **argv,
-	Tcl_AppInitProc *appInitProc));
-
-/*
  * Convenience declaration of Tcl_AppInit for backwards compatibility.
  * This function is not *implemented* by the tcl library, so the storage
  * class is neither DLLEXPORT nor DLLIMPORT
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index c230e20..db70762 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -8,12 +8,23 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclDecls.h,v 1.105 2004/06/07 16:48:44 dgp Exp $
+ * RCS: @(#) $Id: tclDecls.h,v 1.106 2004/11/03 19:13:34 davygrvy Exp $
  */
 
 #ifndef _TCLDECLS
 #define _TCLDECLS
 
+#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
@@ -6075,5 +6086,8 @@ extern TclStubs *tclStubsPtr;
 
 /* !END!: Do not edit above this line. */
 
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
+
 #endif /* _TCLDECLS */
 
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 8fcc9fc..fe64bf7 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.192 2004/11/02 21:08:58 davygrvy Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.193 2004/11/03 19:13:38 davygrvy Exp $
  */
 
 #ifndef _TCLINT
@@ -51,17 +51,6 @@
 #include <string.h>
 #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
-
 /*
  * Used to tag functions that are only to be visible within the module
  * being built and not outside it (where this is supported by the
@@ -2706,8 +2695,5 @@ MODULE_SCOPE void	TclDbInitNewObj _ANSI_ARGS_((Tcl_Obj *objPtr));
 #include "tclIntDecls.h"
 #include "tclIntPlatDecls.h"
 
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif /* _TCLINT */
 
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 7549771..eba2fa4 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclIntDecls.h,v 1.72 2004/10/27 17:13:58 davygrvy Exp $
+ * RCS: @(#) $Id: tclIntDecls.h,v 1.73 2004/11/03 19:13:38 davygrvy Exp $
  */
 
 #ifndef _TCLINTDECLS
@@ -19,10 +19,16 @@
 
 #include "tclPort.h"
 
+#undef TCL_STORAGE_CLASS
 #ifdef BUILD_tcl
-#   undef TCL_STORAGE_CLASS
 #   define TCL_STORAGE_CLASS DLLEXPORT
-#endif /* BUILD_tcl */
+#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
@@ -2036,4 +2042,7 @@ extern TclIntStubs *tclIntStubsPtr;
 
 /* !END!: Do not edit above this line. */
 
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
+
 #endif /* _TCLINTDECLS */
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index 5336621..a3c900c 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -9,12 +9,23 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.25 2004/06/07 16:48:45 dgp Exp $
+ * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.26 2004/11/03 19:13:40 davygrvy Exp $
  */
 
 #ifndef _TCLINTPLATDECLS
 #define _TCLINTPLATDECLS
 
+#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
@@ -549,4 +560,7 @@ extern TclIntPlatStubs *tclIntPlatStubsPtr;
 
 /* !END!: Do not edit above this line. */
 
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
+
 #endif /* _TCLINTPLATDECLS */
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index 932d24f..6dc83e0 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -6,12 +6,23 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tclPlatDecls.h,v 1.23 2004/06/07 16:48:45 dgp Exp $
+ * RCS: @(#) $Id: tclPlatDecls.h,v 1.24 2004/11/03 19:13:40 davygrvy Exp $
  */
 
 #ifndef _TCLPLATDECLS
 #define _TCLPLATDECLS
 
+#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
+
 /*
  *  Pull in the typedef of TCHAR for windows.
  */
@@ -123,6 +134,9 @@ extern TclPlatStubs *tclPlatStubsPtr;
 
 /* !END!: Do not edit above this line. */
 
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
+
 #endif /* _TCLPLATDECLS */