[Emacs-diffs] trunk r114590: Fix bug #15565 with assertion violations in x_free_gc.

[Eli Zaretskii]

------------------------------------------------------------
revno: 114590
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15565
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2013-10-09 17:53:13 +0300
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xfaces.c                   xfaces.c-20091113204419-o5vbwnq5f7feedwu-560

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-09 03:32:35 +0000
+++ b/src/ChangeLog     2013-10-09 14:53:13 +0000
@@ -1,3 +1,8 @@
+2013-10-09  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * fns.c (hashfn_user_defined): Allow hash functions to return any

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2013-09-24 06:43:20 +0000
+++ b/src/xfaces.c      2013-10-09 14:53:13 +0000
@@ -603,7 +603,7 @@
 x_free_gc (struct frame *f, GC gc)
 {
   eassert (input_blocked_p ());
-  IF_DEBUG (eassert (--ngcs >= 0));
+  IF_DEBUG ((--ngcs, eassert (ngcs >= 0)));
   XFreeGC (FRAME_X_DISPLAY (f), gc);
 }
 
@@ -629,7 +629,7 @@
 static void
 x_free_gc (struct frame *f, GC gc)
 {
-  IF_DEBUG (eassert (--ngcs >= 0));
+  IF_DEBUG ((--ngcs, eassert (ngcs >= 0)));
   xfree (gc);
 }