summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredman <redman>1999-05-19 23:27:09 (GMT)
committerredman <redman>1999-05-19 23:27:09 (GMT)
commitb2cc5aedb9bd61f39eb8e0f4f6d9c282f523bfc3 (patch)
tree8ff1c419444ccfe6b5013578e7b6b5d82b26e1c1
parentd65ded15b78cbaf83e95762557a47771d81090e3 (diff)
downloadtcl-b2cc5aedb9bd61f39eb8e0f4f6d9c282f523bfc3.zip
tcl-b2cc5aedb9bd61f39eb8e0f4f6d9c282f523bfc3.tar.gz
tcl-b2cc5aedb9bd61f39eb8e0f4f6d9c282f523bfc3.tar.bz2
Add extern "C" block around header to fix C++ compilation.
-rw-r--r--ChangeLog6
-rw-r--r--generic/tcl.h18
2 files changed, 23 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cf21120..4862c01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-05-19 <redman@scriptics.com>
+
+ * generic/tcl.h: Add extern "C" block around entire header file for
+ C++ compilers to fix linkage issues. Submitted by Don Porter and
+ Paul Duffin.
+
1999-05-18 <stanton@scriptics.com>
* win/tclWinChan.c: Modified initialization code to avoid
diff --git a/generic/tcl.h b/generic/tcl.h
index 9524f87..0c21a45 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -12,13 +12,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.43 1999/04/30 23:35:40 stanton Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.43.2.1 1999/05/19 23:27:09 redman 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.
*/
@@ -1543,4 +1551,12 @@ EXTERN int Tcl_AppInit _ANSI_ARGS_((Tcl_Interp *interp));
#undef TCL_STORAGE_CLASS
#define TCL_STORAGE_CLASS DLLIMPORT
+/*
+ * end block for C++
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _TCL */