comparison src/xfaces.c @ 83248:86457de2420c

Merged from miles@gnu.org--gnu-2005 (patch 76-78) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-76 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-77 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-78 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-288
author Karoly Lorentey <lorentey@elte.hu>
date Fri, 04 Feb 2005 15:36:07 +0000
parents a464201fbd10 d6551c039c8f
children 89ac10c67e45
comparison
equal deleted inserted replaced
83247:a257c9edb57b 83248:86457de2420c
1 /* xfaces.c -- "Face" primitives. 1 /* xfaces.c -- "Face" primitives.
2 Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004 2 Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
3 Free Software Foundation. 3 Free Software Foundation.
4 4
5 This file is part of GNU Emacs. 5 This file is part of GNU Emacs.
6 6
7 GNU Emacs is free software; you can redistribute it and/or modify 7 GNU Emacs is free software; you can redistribute it and/or modify
739 x_free_gc (f, gc) 739 x_free_gc (f, gc)
740 struct frame *f; 740 struct frame *f;
741 GC gc; 741 GC gc;
742 { 742 {
743 BLOCK_INPUT; 743 BLOCK_INPUT;
744 #if GLYPH_DEBUG 744 IF_DEBUG (xassert (--ngcs >= 0));
745 xassert (--ngcs >= 0);
746 #endif
747 XFreeGC (FRAME_X_DISPLAY (f), gc); 745 XFreeGC (FRAME_X_DISPLAY (f), gc);
748 UNBLOCK_INPUT; 746 UNBLOCK_INPUT;
749 } 747 }
750 748
751 #endif /* HAVE_X_WINDOWS */ 749 #endif /* HAVE_X_WINDOWS */
774 x_free_gc (f, gc) 772 x_free_gc (f, gc)
775 struct frame *f; 773 struct frame *f;
776 GC gc; 774 GC gc;
777 { 775 {
778 BLOCK_INPUT; 776 BLOCK_INPUT;
779 xassert (--ngcs >= 0); 777 IF_DEBUG (xassert (--ngcs >= 0));
780 xfree (gc); 778 xfree (gc);
781 UNBLOCK_INPUT; 779 UNBLOCK_INPUT;
782 } 780 }
783 781
784 #endif /* WINDOWSNT */ 782 #endif /* WINDOWSNT */