* Merged changes from 8.1.0 branch

6 files changed, 36 insertions, 6 deletions

diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 8051955..c017771 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.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: tkDecls.h,v 1.4 1999/04/28 18:18:06 redman Exp $
+ * RCS: @(#) $Id: tkDecls.h,v 1.5 1999/04/30 22:49:54 stanton Exp $
  */
 
 #ifndef _TKDECLS
@@ -979,7 +979,13 @@ typedef struct TkStubs {
     int (*tk_CreateConsoleWindow) _ANSI_ARGS_((Tcl_Interp * interp)); /* 216 */
 } TkStubs;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 extern TkStubs *tkStubsPtr;
+#ifdef __cplusplus
+}
+#endif
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index ce49c94..38996ed 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -15,7 +15,7 @@
  *	   Department of Computer Science,
  *	   Australian National University.
  *
- * RCS: @(#) $Id: tkImgPhoto.c,v 1.7 1999/04/24 01:50:48 stanton Exp $
+ * RCS: @(#) $Id: tkImgPhoto.c,v 1.8 1999/04/30 22:49:55 stanton Exp $
  */
 
 #include "tkInt.h"
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 7d8fc3d..f46e7c2 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.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: tkIntDecls.h,v 1.4 1999/04/24 01:50:48 stanton Exp $
+ * RCS: @(#) $Id: tkIntDecls.h,v 1.5 1999/04/30 22:49:55 stanton Exp $
  */
 
 #ifndef _TKINTDECLS
@@ -621,7 +621,13 @@ typedef struct TkIntStubs {
 #endif /* MAC_TCL */
 } TkIntStubs;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 extern TkIntStubs *tkIntStubsPtr;
+#ifdef __cplusplus
+}
+#endif
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 7a1c1be..f1111ec 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.4 1999/04/24 01:50:49 stanton Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.5 1999/04/30 22:49:55 stanton Exp $
  */
 
 #ifndef _TKINTPLATDECLS
@@ -429,7 +429,13 @@ typedef struct TkIntPlatStubs {
 #endif /* MAC_TCL */
 } TkIntPlatStubs;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 extern TkIntPlatStubs *tkIntPlatStubsPtr;
+#ifdef __cplusplus
+}
+#endif
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 54a68ca..ae23707 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.6 1999/04/24 01:50:49 stanton Exp $
+ * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.7 1999/04/30 22:49:55 stanton Exp $
  */
 
 #ifndef _TKINTXLIBDECLS
@@ -799,7 +799,13 @@ typedef struct TkIntXlibStubs {
 #endif /* MAC_TCL */
 } TkIntXlibStubs;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 extern TkIntXlibStubs *tkIntXlibStubsPtr;
+#ifdef __cplusplus
+}
+#endif
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index e0dd331..a074241 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.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: tkPlatDecls.h,v 1.3 1999/04/16 01:51:21 stanton Exp $
+ * RCS: @(#) $Id: tkPlatDecls.h,v 1.4 1999/04/30 22:49:55 stanton Exp $
  */
 
 #ifndef _TKPLATDECLS
@@ -111,7 +111,13 @@ typedef struct TkPlatStubs {
 #endif /* MAC_TCL */
 } TkPlatStubs;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 extern TkPlatStubs *tkPlatStubsPtr;
+#ifdef __cplusplus
+}
+#endif
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)