summaryrefslogtreecommitdiffstats
path: root/generic/tkFont.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-06-11 15:25:12 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-06-11 15:25:12 (GMT)
commit353247a615b7fd61f9d3d0e8b83932117b972cf0 (patch)
treeb3ec63db1c5a72053b4a6942ed9641109cee0d60 /generic/tkFont.h
parentbd33c4f3a417d27aebd67b95239b3efd2238dac9 (diff)
downloadtk-353247a615b7fd61f9d3d0e8b83932117b972cf0.zip
tk-353247a615b7fd61f9d3d0e8b83932117b972cf0.tar.gz
tk-353247a615b7fd61f9d3d0e8b83932117b972cf0.tar.bz2
Fix [4fb812af90]: Build Failure on msys2 with gcc10. Also add more __cplusplus-related scope blocks around (internal) MODULE_SCOPE definitions.
Diffstat (limited to 'generic/tkFont.h')
-rw-r--r--generic/tkFont.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/generic/tkFont.h b/generic/tkFont.h
index 50f79d2..ceabee3 100644
--- a/generic/tkFont.h
+++ b/generic/tkFont.h
@@ -14,6 +14,10 @@
#ifndef _TKFONT
#define _TKFONT
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*
* The following structure keeps track of the attributes of a font. It can be
* used to keep track of either the desired attributes or the actual
@@ -221,4 +225,8 @@ MODULE_SCOPE void TkpGetFontFamilies(Tcl_Interp *interp,
Tk_Window tkwin);
MODULE_SCOPE TkFont * TkpGetNativeFont(Tk_Window tkwin, const char *name);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _TKFONT */