Index: Makefile.in
===================================================================
diff -u -N -re494dcc1b9608895c777ea40e4e2710bc85d9fa1 -r2ff112f22072618fa57d835aceafcc10ac3adf5a
--- Makefile.in	(.../Makefile.in)	(revision e494dcc1b9608895c777ea40e4e2710bc85d9fa1)
+++ Makefile.in	(.../Makefile.in)	(revision 2ff112f22072618fa57d835aceafcc10ac3adf5a)
@@ -706,8 +706,8 @@
 # Target to regenerate header files and stub files from the *.decls tables.
 #
 
-TCL_SRC_DIR_85=/usr/local/src/tcl8.5.16
-TCL_SRC_DIR_86=/usr/local/src/tcl8.6.1
+TCL_SRC_DIR_85=/usr/local/src/tcl8.5.17
+TCL_SRC_DIR_86=/usr/local/src/tcl8.6.2
 
 genstubs:
 	mkdir -p $(src_generic_dir)/stubs8.5
Index: generic/stubs8.6/nsfDecls.h
===================================================================
diff -u -N -r6d2855a9a603f924c8578abf30b374901741f4a1 -r2ff112f22072618fa57d835aceafcc10ac3adf5a
--- generic/stubs8.6/nsfDecls.h	(.../nsfDecls.h)	(revision 6d2855a9a603f924c8578abf30b374901741f4a1)
+++ generic/stubs8.6/nsfDecls.h	(.../nsfDecls.h)	(revision 2ff112f22072618fa57d835aceafcc10ac3adf5a)
@@ -53,6 +53,10 @@
 
 /* !BEGIN!: Do not edit below this line. */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * Exported function declarations:
  */
@@ -244,10 +248,8 @@
     int (*nsf_CmdDefinitionRegister) (Tcl_Interp *interp, Nsf_methodDefinition *definitionRecords); /* 39 */
 } NsfStubs;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern const NsfStubs *nsfStubsPtr;
+
 #ifdef __cplusplus
 }
 #endif
Index: generic/stubs8.6/nsfIntDecls.h
===================================================================
diff -u -N -rcbcfec72376d549a806859c873195cc0ebc9c9ea -r2ff112f22072618fa57d835aceafcc10ac3adf5a
--- generic/stubs8.6/nsfIntDecls.h	(.../nsfIntDecls.h)	(revision cbcfec72376d549a806859c873195cc0ebc9c9ea)
+++ generic/stubs8.6/nsfIntDecls.h	(.../nsfIntDecls.h)	(revision 2ff112f22072618fa57d835aceafcc10ac3adf5a)
@@ -54,6 +54,10 @@
 
 /* !BEGIN!: Do not edit below this line. */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * Exported function declarations:
  */
@@ -65,10 +69,8 @@
 
 } NsfIntStubs;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern const NsfIntStubs *nsfIntStubsPtr;
+
 #ifdef __cplusplus
 }
 #endif