summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-11-09 10:58:53 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-11-09 10:58:53 (GMT)
commit7e6a8b0a249f5e75c648e579156e3b30c8866eeb (patch)
tree25062bf113483fcb6c5df2a04eccfb0ea391e471 /generic
parent79c47400ba2c83d6e7b6213f5d2d79994796a2fb (diff)
downloadtk-7e6a8b0a249f5e75c648e579156e3b30c8866eeb.zip
tk-7e6a8b0a249f5e75c648e579156e3b30c8866eeb.tar.gz
tk-7e6a8b0a249f5e75c648e579156e3b30c8866eeb.tar.bz2
Workaround for possible build problem on Windows/MacOSX: Some (older) versions of X11/Xutil.h have a wrong signature for XOffsetRegion/XUnionRegion, so move them out of the way temporarly.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkIntXlibDecls.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 8e7d650..de44068 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -23,7 +23,13 @@
# include <tcl.h>
#endif
+/* Some (older) versions of X11/Xutil.h have a wrong signature of those
+ two functions, so move them out of the way temporarly. */
+#define XOffsetRegion _XOffsetRegion
+#define XUnionRegion _XUnionRegion
#include "X11/Xutil.h"
+#undef XOffsetRegion
+#undef XUnionRegion
#ifdef BUILD_tk
#undef TCL_STORAGE_CLASS