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 | bdfa540768b4344cef460087c5c8cb74e6c1cc8a (patch) | |
| tree | 13a69450faf3a1b0ee52e2abbad33c08869e111a | |
| parent | bc3e106c11be62dd6e964a88c04f3153a07c6679 (diff) | |
| parent | 1a65bef99396a7e97fbdc4e964d1cacf8dee4984 (diff) | |
| download | tk-bdfa540768b4344cef460087c5c8cb74e6c1cc8a.zip tk-bdfa540768b4344cef460087c5c8cb74e6c1cc8a.tar.gz tk-bdfa540768b4344cef460087c5c8cb74e6c1cc8a.tar.bz2 | |
Merge core-8-6-branch
| -rw-r--r-- | generic/tkIntXlibDecls.h | 6 | ||||
| -rw-r--r-- | macosx/tkMacOSXPort.h | 1 | ||||
| -rw-r--r-- | xlib/xutil.c | 1 |
3 files changed, 7 insertions, 1 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 diff --git a/macosx/tkMacOSXPort.h b/macosx/tkMacOSXPort.h index 0c3b347..bd48bd5 100644 --- a/macosx/tkMacOSXPort.h +++ b/macosx/tkMacOSXPort.h @@ -53,7 +53,6 @@ #include <X11/Xatom.h> #include <X11/Xfuncproto.h> #include <X11/Xutil.h> -#include "tkIntXlibDecls.h" /* * The following macro defines the type of the mask arguments to diff --git a/xlib/xutil.c b/xlib/xutil.c index 0514d7a..7b69e18 100644 --- a/xlib/xutil.c +++ b/xlib/xutil.c @@ -12,6 +12,7 @@ #include <stdlib.h> #include <tk.h> +#include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xatom.h> |