summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2009-11-11 15:56:46 (GMT)
committerdgp <dgp@users.sourceforge.net>2009-11-11 15:56:46 (GMT)
commitda2611425bfd7e8e60f4c170fed650cdd316b3b7 (patch)
tree77e20902e429737908f370cd9d6a8b0a988a9040
parent5a588e70b4cbbcdb05ac6d79e87b33b562ef1632 (diff)
downloadtk-da2611425bfd7e8e60f4c170fed650cdd316b3b7.zip
tk-da2611425bfd7e8e60f4c170fed650cdd316b3b7.tar.gz
tk-da2611425bfd7e8e60f4c170fed650cdd316b3b7.tar.bz2
* generic/tkPlatDecls.h: Restore C++ friendliness to the
tkPlatDecls.h header file, which we insist extensions #include to gain access to the Tk_*HWND*() routines. [Bug 2886635].
-rw-r--r--ChangeLog6
-rw-r--r--generic/tkPlatDecls.h10
2 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ac782a..d518aad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-11 Don Porter <dgp@users.sourceforge.net>
+
+ * generic/tkPlatDecls.h: Restore C++ friendliness to the
+ tkPlatDecls.h header file, which we insist extensions #include to
+ gain access to the Tk_*HWND*() routines. [Bug 2886635].
+
2009-11-10 Andreas Kupries <andreask@activestate.com>
* unix/Makefile.in: Partially reverted Don Porter's 2009-10-20
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index 2d4b1f1..741ebbf 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.20 2009/06/29 14:35:01 das Exp $
+ * RCS: @(#) $Id: tkPlatDecls.h,v 1.21 2009/11/11 15:56:48 dgp Exp $
*/
#ifndef _TKPLATDECLS
@@ -25,6 +25,10 @@
* in the generic/tk.decls script.
*/
+#ifdef __cplusplus
+#extern "C" {
+#endif
+
/* !BEGIN!: Do not edit below this line. */
/*
@@ -243,6 +247,10 @@ extern const TkPlatStubs *tkPlatStubsPtr;
/* !END!: Do not edit above this line. */
+#ifdef __cplusplus
+}
+#endif
+
#undef TCL_STORAGE_CLASS
#define TCL_STORAGE_CLASS DLLIMPORT