From: Miles Bader Date: Fri, 12 Oct 2007 21:57:45 +0000 (+0000) Subject: Fix non-window-system compilation X-Git-Tag: emacs-pretest-23.0.90~8295^2~314 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3e88ae627ef8d827b3f79e4e6f14aaad7adfe322;p=emacs.git Fix non-window-system compilation src/dispextern.h (struct glyph_row): Only define "clip" field if HAVE_WINDOW_SYSTEM is defined. Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-263 --- diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode index 345890b36db..251de8f6bbe 100644 --- a/src/ChangeLog.unicode +++ b/src/ChangeLog.unicode @@ -1,3 +1,8 @@ +2007-10-12 Miles Bader + + * src/dispextern.h (struct glyph_row): Only define "clip" field if + HAVE_WINDOW_SYSTEM is defined. + 2007-10-12 Stefan Monnier Fix up multy-tty merge. diff --git a/src/dispextern.h b/src/dispextern.h index 1ba2955fcb9..32ecee96f60 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -853,9 +853,11 @@ struct glyph_row /* Continuation lines width at the start of the row. */ int continuation_lines_width; +#ifdef HAVE_WINDOW_SYSTEM /* Non-NULL means the current clipping area. This is temporarily set while exposing a region. Coordinates are frame-relative. */ XRectangle *clip; +#endif };