summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-11-09 11:03:29 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-11-09 11:03:29 (GMT)
commitd923ff63c9b6637fbae77b9dbed6ced704eba82b (patch)
tree13a69450faf3a1b0ee52e2abbad33c08869e111a
parent124fef9f3d03e66b30afa8dd77ba9b20929d63e7 (diff)
parent7e6a8b0a249f5e75c648e579156e3b30c8866eeb (diff)
downloadtk-d923ff63c9b6637fbae77b9dbed6ced704eba82b.zip
tk-d923ff63c9b6637fbae77b9dbed6ced704eba82b.tar.gz
tk-d923ff63c9b6637fbae77b9dbed6ced704eba82b.tar.bz2
Merge core-8-6-branch
-rw-r--r--generic/tkIntXlibDecls.h6
-rw-r--r--macosx/tkMacOSXPort.h1
-rw-r--r--xlib/xutil.c1
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>