summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2004-12-13 22:17:32 (GMT)
committerdgp <dgp@users.sourceforge.net>2004-12-13 22:17:32 (GMT)
commitf8f6d44458d0a24b3093571e39738b65b58f8264 (patch)
treef5600cd139205dc62f3333dc5c6012814ba16df7
parent10bb91f83c06110b9f30488d2aa5a264e7ec8294 (diff)
downloadtcl-f8f6d44458d0a24b3093571e39738b65b58f8264.zip
tcl-f8f6d44458d0a24b3093571e39738b65b58f8264.tar.gz
tcl-f8f6d44458d0a24b3093571e39738b65b58f8264.tar.bz2
* generic/tcl.h: Restored extern "C" guards so that C++ code
sees function pointer typedef linkage consistent with earlier Tcl releases. [Bug 1082349].
-rw-r--r--ChangeLog4
-rw-r--r--generic/tcl.h18
2 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3410cd2..ab2e52a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2004-12-13 Don Porter <dgp@users.sourceforge.net>
+ * generic/tcl.h: Restored extern "C" guards so that C++ code
+ sees function pointer typedef linkage consistent with earlier Tcl
+ releases. [Bug 1082349].
+
* generic/tclEncoding.c: Plugged some memory leaks. Thanks to
* generic/tclUtil.c: Rolf Ade for reports and testing [Bug 1083082]
diff --git a/generic/tcl.h b/generic/tcl.h
index 2a58e9d..c183783 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -13,13 +13,21 @@
* 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.192 2004/12/10 23:00:30 dkf Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.193 2004/12/13 22:17:33 dgp Exp $
*/
#ifndef _TCL
#define _TCL
/*
+ * * For C++ compilers, use extern "C"
+ * */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
* The following defines are used to indicate the various release levels.
*/
@@ -2353,4 +2361,12 @@ EXTERN int Tcl_AppInit _ANSI_ARGS_((Tcl_Interp *interp));
#define TCL_STORAGE_CLASS DLLIMPORT
#endif /* RC_INVOKED */
+
+/*
+ * * end block for C++
+ * */
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _TCL */