diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-09 11:03:29 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-09 11:03:29 (GMT) |
| commit | d923ff63c9b6637fbae77b9dbed6ced704eba82b (patch) | |
| tree | 13a69450faf3a1b0ee52e2abbad33c08869e111a /generic | |
| parent | 124fef9f3d03e66b30afa8dd77ba9b20929d63e7 (diff) | |
| parent | 7e6a8b0a249f5e75c648e579156e3b30c8866eeb (diff) | |
| download | tk-d923ff63c9b6637fbae77b9dbed6ced704eba82b.zip tk-d923ff63c9b6637fbae77b9dbed6ced704eba82b.tar.gz tk-d923ff63c9b6637fbae77b9dbed6ced704eba82b.tar.bz2 | |
Merge core-8-6-branch
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkIntXlibDecls.h | 6 |
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 |