summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-07-16 19:37:47 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-07-16 19:37:47 (GMT)
commit2ef3587473dbc2fd4ddec6a6a0c2374e54a20364 (patch)
tree1e8f9df5f98687e043c1c9b7d903e4c170c55b15 /generic
parent763538938fe9fcfcbb6fda499d06930f54c77c73 (diff)
parent78d66d5a3c3804ab79bdea5bd12ee198918da2f8 (diff)
downloadtk-2ef3587473dbc2fd4ddec6a6a0c2374e54a20364.zip
tk-2ef3587473dbc2fd4ddec6a6a0c2374e54a20364.tar.gz
tk-2ef3587473dbc2fd4ddec6a6a0c2374e54a20364.tar.bz2
merge 8.5
Diffstat (limited to 'generic')
-rw-r--r--generic/tkInt.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h
index a95adf8..c30eceb 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -1187,7 +1187,7 @@ MODULE_SCOPE Status TkParseColor (Display * display,
XColor * colorPtr);
#endif
#ifdef HAVE_XFT
-MODULE_SCOPE void TkUnixSetXftClipRegion(Region clipRegion);
+MODULE_SCOPE void TkUnixSetXftClipRegion(TkRegion clipRegion);
#endif
/*