summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2007-10-12 21:57:45 +0000
committerMiles Bader <miles@gnu.org>2007-10-12 21:57:45 +0000
commit3e88ae627ef8d827b3f79e4e6f14aaad7adfe322 (patch)
tree345ac67c756cdd3e70c399f955c5f41be3795faa
parent985773c9038f9847f9e7362f3b5fb0c8acac13a2 (diff)
downloademacs-3e88ae627ef8d827b3f79e4e6f14aaad7adfe322.tar.gz
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
-rw-r--r--src/ChangeLog.unicode5
-rw-r--r--src/dispextern.h2
2 files changed, 7 insertions, 0 deletions
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 <miles@gnu.org>
+
+ * src/dispextern.h (struct glyph_row): Only define "clip" field if
+ HAVE_WINDOW_SYSTEM is defined.
+
2007-10-12 Stefan Monnier <monnier@iro.umontreal.ca>
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
};