Commit 051277bf authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix bug #15565 with assertion violations in x_free_gc.

 src/xfaces.c (x_free_gc) [HAVE_X_WINDOWS, HAVE_NTGUI]: Don't pass
 expressions with side effects to eassert.
parent 95273451
2013-10-09 Eli Zaretskii <eliz@gnu.org>
* xfaces.c (x_free_gc) [HAVE_X_WINDOWS, HAVE_NTGUI]: Don't pass
expressions with side effects to eassert. (Bug#15565)
2013-10-09 Stefan Monnier <monnier@iro.umontreal.ca> 2013-10-09 Stefan Monnier <monnier@iro.umontreal.ca>
* fns.c (hashfn_user_defined): Allow hash functions to return any * fns.c (hashfn_user_defined): Allow hash functions to return any
......
...@@ -603,7 +603,7 @@ static void ...@@ -603,7 +603,7 @@ static void
x_free_gc (struct frame *f, GC gc) x_free_gc (struct frame *f, GC gc)
{ {
eassert (input_blocked_p ()); eassert (input_blocked_p ());
IF_DEBUG (eassert (--ngcs >= 0)); IF_DEBUG ((--ngcs, eassert (ngcs >= 0)));
XFreeGC (FRAME_X_DISPLAY (f), gc); XFreeGC (FRAME_X_DISPLAY (f), gc);
} }
...@@ -629,7 +629,7 @@ x_create_gc (struct frame *f, unsigned long mask, XGCValues *xgcv) ...@@ -629,7 +629,7 @@ x_create_gc (struct frame *f, unsigned long mask, XGCValues *xgcv)
static void static void
x_free_gc (struct frame *f, GC gc) x_free_gc (struct frame *f, GC gc)
{ {
IF_DEBUG (eassert (--ngcs >= 0)); IF_DEBUG ((--ngcs, eassert (ngcs >= 0)));
xfree (gc); xfree (gc);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment