Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-111
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-112
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-113
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-114
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-115
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-518

1 files changed, 4 insertions, 4 deletions

diff --git a/src/macgui.h b/src/macgui.h
index cfe35e82945..a84fea1ae91 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -217,13 +217,13 @@ typedef struct _XGC
   RGBColor back_color;
 
 #define MAX_CLIP_RECTS 2
-  /* QuickDraw clipping region.  */
+  /* Number of clipping rectangles.  */
+  int n_clip_rects;
+
+  /* QuickDraw clipping region.  Ignored if n_clip_rects == 0.  */
   RgnHandle clip_region;
 
 #if defined (MAC_OSX) && USE_ATSUI
-  /* Number of clipping rectangles used in Quartz 2D drawing.  */
-  int n_clip_rects;
-
   /* Clipping rectangles used in Quartz 2D drawing.  The y-coordinate
      is in QuickDraw's.  */
   CGRect clip_rects[MAX_CLIP_RECTS];