7 files changed, 32 insertions, 17 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index 8f51eb1..1d4b94b 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.254 2008/03/28 17:31:44 dgp Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.255 2008/04/01 16:23:39 dgp Exp $
  */
 
 #ifndef _TCL
@@ -58,12 +58,12 @@ extern "C" {
  */
 
 #define TCL_MAJOR_VERSION   8
-#define TCL_MINOR_VERSION   5
-#define TCL_RELEASE_LEVEL   TCL_FINAL_RELEASE
-#define TCL_RELEASE_SERIAL  2
+#define TCL_MINOR_VERSION   6
+#define TCL_RELEASE_LEVEL   TCL_ALPHA_RELEASE
+#define TCL_RELEASE_SERIAL  0
 
-#define TCL_VERSION	    "8.5"
-#define TCL_PATCH_LEVEL	    "8.5.2"
+#define TCL_VERSION	    "8.6"
+#define TCL_PATCH_LEVEL	    "8.6a0"
 
 /*
  * The following definitions set up the proper options for Windows compilers.
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 07c2ef7..87b251f 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -14,7 +14,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclBasic.c,v 1.295 2008/03/14 19:53:10 dgp Exp $
+ * RCS: @(#) $Id: tclBasic.c,v 1.296 2008/04/01 16:23:40 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -810,11 +810,6 @@ Tcl_CreateInterp(void)
 
     Tcl_PkgProvideEx(interp, "Tcl", TCL_PATCH_LEVEL, &tclStubs);
 
-#ifdef Tcl_InitStubs
-#undef Tcl_InitStubs
-#endif
-    Tcl_InitStubs(interp, TCL_VERSION, 1);
-
     if (TclTommath_Init(interp) != TCL_OK) {
 	Tcl_Panic(Tcl_GetString(Tcl_GetObjResult(interp)));
     }
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 865dd6c..db398d7 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.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: tclDecls.h,v 1.130 2007/12/13 15:23:16 dgp Exp $
+ * RCS: @(#) $Id: tclDecls.h,v 1.131 2008/04/01 16:23:40 dgp Exp $
  */
 
 #ifndef _TCLDECLS
@@ -4142,6 +4142,8 @@ typedef struct TclStubs {
     void (*tcl_AppendPrintfToObj) (Tcl_Obj * objPtr, CONST char * format, ...); /* 579 */
 } TclStubs;
 
+#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -4150,6 +4152,8 @@ extern TclStubs *tclStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
+
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
 
 /*
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 0ff03f9..983b39c 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.112 2008/01/23 17:31:42 dgp Exp $
+ * RCS: @(#) $Id: tclIntDecls.h,v 1.113 2008/04/01 16:23:41 dgp Exp $
  */
 
 #ifndef _TCLINTDECLS
@@ -1344,6 +1344,8 @@ typedef struct TclIntStubs {
     void (*tclBackgroundException) (Tcl_Interp * interp, int code); /* 236 */
 } TclIntStubs;
 
+#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1352,6 +1354,8 @@ extern TclIntStubs *tclIntStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
+
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
 
 /*
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index 38563b1..7b8ab8e 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.32 2007/12/13 15:23:18 dgp Exp $
+ * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.33 2008/04/01 16:23:41 dgp Exp $
  */
 
 #ifndef _TCLINTPLATDECLS
@@ -446,6 +446,8 @@ typedef struct TclIntPlatStubs {
 #endif /* MACOSX */
 } TclIntPlatStubs;
 
+#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -454,6 +456,8 @@ extern TclIntPlatStubs *tclIntPlatStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
+
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
 
 /*
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index c581274..1e695eb 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -6,7 +6,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tclPlatDecls.h,v 1.27 2007/12/13 15:23:20 dgp Exp $
+ * RCS: @(#) $Id: tclPlatDecls.h,v 1.28 2008/04/01 16:23:41 dgp Exp $
  */
 
 #ifndef _TCLPLATDECLS
@@ -94,6 +94,8 @@ typedef struct TclPlatStubs {
 #endif /* MACOSX */
 } TclPlatStubs;
 
+#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -102,6 +104,8 @@ extern TclPlatStubs *tclPlatStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
+
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
 
 /*
diff --git a/generic/tclTomMathDecls.h b/generic/tclTomMathDecls.h
index 785c61b..d12f199 100644
--- a/generic/tclTomMathDecls.h
+++ b/generic/tclTomMathDecls.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: tclTomMathDecls.h,v 1.2 2006/11/15 14:58:27 dgp Exp $
+ * RCS: @(#) $Id: tclTomMathDecls.h,v 1.3 2008/04/01 16:23:42 dgp Exp $
  */
 
 #ifndef _TCLTOMMATHDECLS
@@ -520,6 +520,8 @@ typedef struct TclTomMathStubs {
     int (*tclBN_s_mp_sub) (mp_int* a, mp_int* b, mp_int* c); /* 60 */
 } TclTomMathStubs;
 
+#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -528,6 +530,8 @@ extern TclTomMathStubs *tclTomMathStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
+
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
 
 /*