summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2011-07-28 12:31:00 (GMT)
committerdgp <dgp@users.sourceforge.net>2011-07-28 12:31:00 (GMT)
commit7891b1c74af0da4f570b8ac859b8f57dc7798081 (patch)
tree3507bfbef2415b944fa189c5f0e7bf5720f424a3
parented5e4376c028699600ed2336f5721ad1c2fd5c1c (diff)
parent0108a2f7580c151b99fe943825efc9bdc1c10d6b (diff)
downloadtk-7891b1c74af0da4f570b8ac859b8f57dc7798081.zip
tk-7891b1c74af0da4f570b8ac859b8f57dc7798081.tar.gz
tk-7891b1c74af0da4f570b8ac859b8f57dc7798081.tar.bz2
merge to rc
-rw-r--r--ChangeLog5
-rw-r--r--xlib/X11/Xutil.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d80362..6f2c6c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-28 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * xlib/X11/Xutil.h: [Bug 3380684] XEmptyRegion prototype doesn't
+ match usage
+
2011-07-19 Donal K. Fellows <dkf@users.sf.net>
* doc/*.3, doc/*.n: Many small fixes to documentation as part of
diff --git a/xlib/X11/Xutil.h b/xlib/X11/Xutil.h
index e42ed5d..7348e90 100644
--- a/xlib/X11/Xutil.h
+++ b/xlib/X11/Xutil.h
@@ -364,13 +364,13 @@ extern void XDestroyRegion(
#endif
);
-extern void XEmptyRegion(
+extern Bool XEmptyRegion(
#if NeedFunctionPrototypes
Region /* r */
#endif
);
-extern void XEqualRegion(
+extern Bool XEqualRegion(
#if NeedFunctionPrototypes
Region /* r1 */,
Region /* r2 */