summaryrefslogtreecommitdiffstats
path: root/generic/tkInt.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-09-24 15:01:58 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-09-24 15:01:58 (GMT)
commitc1d2b9d95856fe913236eec23533b0bd522726d3 (patch)
treed2205c21c6895c4707b37d72ce3afbc98f0d3b4c /generic/tkInt.h
parent93a3e63b7e9a22f94f1101b7ba32ac79738e5b65 (diff)
downloadtk-c1d2b9d95856fe913236eec23533b0bd522726d3.zip
tk-c1d2b9d95856fe913236eec23533b0bd522726d3.tar.gz
tk-c1d2b9d95856fe913236eec23533b0bd522726d3.tar.bz2
Don't use "class" as (internal) struct field name or local variable name. Make it "c_class" (just as X11 does as well), in order to prevent conflict with C++ compilers.
Diffstat (limited to 'generic/tkInt.h')
-rw-r--r--generic/tkInt.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h
index e4e49cb..c1bd562d 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -1267,6 +1267,10 @@ MODULE_SCOPE Status TkParseColor (Display * display,
MODULE_SCOPE void TkUnixSetXftClipRegion(TkRegion clipRegion);
#endif
+#if !defined(__cplusplus) && !defined(c_plusplus)
+# define c_class class
+#endif
+
#if TCL_UTF_MAX > 4
# define TkUtfToUniChar Tcl_UtfToUniChar
# define TkUniCharToUtf Tcl_UniCharToUtf