diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-09 10:58:53 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-09 10:58:53 (GMT) |
| commit | 1a65bef99396a7e97fbdc4e964d1cacf8dee4984 (patch) | |
| tree | 25062bf113483fcb6c5df2a04eccfb0ea391e471 /generic/tkIntXlibDecls.h | |
| parent | b2397ebe42189500971482f537b7da3b4996e8be (diff) | |
| download | tk-1a65bef99396a7e97fbdc4e964d1cacf8dee4984.zip tk-1a65bef99396a7e97fbdc4e964d1cacf8dee4984.tar.gz tk-1a65bef99396a7e97fbdc4e964d1cacf8dee4984.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/tkIntXlibDecls.h')
| -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 |