diff options
| author | Miles Bader | 2007-10-12 21:57:45 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-10-12 21:57:45 +0000 |
| commit | 3e88ae627ef8d827b3f79e4e6f14aaad7adfe322 (patch) | |
| tree | 345ac67c756cdd3e70c399f955c5f41be3795faa /src | |
| parent | 985773c9038f9847f9e7362f3b5fb0c8acac13a2 (diff) | |
| download | emacs-3e88ae627ef8d827b3f79e4e6f14aaad7adfe322.tar.gz emacs-3e88ae627ef8d827b3f79e4e6f14aaad7adfe322.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog.unicode | 5 | ||||
| -rw-r--r-- | src/dispextern.h | 2 |
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 @@ | |||
| 1 | 2007-10-12 Miles Bader <miles@gnu.org> | ||
| 2 | |||
| 3 | * src/dispextern.h (struct glyph_row): Only define "clip" field if | ||
| 4 | HAVE_WINDOW_SYSTEM is defined. | ||
| 5 | |||
| 1 | 2007-10-12 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2007-10-12 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | Fix up multy-tty merge. | 8 | 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 | |||
| 853 | /* Continuation lines width at the start of the row. */ | 853 | /* Continuation lines width at the start of the row. */ |
| 854 | int continuation_lines_width; | 854 | int continuation_lines_width; |
| 855 | 855 | ||
| 856 | #ifdef HAVE_WINDOW_SYSTEM | ||
| 856 | /* Non-NULL means the current clipping area. This is temporarily | 857 | /* Non-NULL means the current clipping area. This is temporarily |
| 857 | set while exposing a region. Coordinates are frame-relative. */ | 858 | set while exposing a region. Coordinates are frame-relative. */ |
| 858 | XRectangle *clip; | 859 | XRectangle *clip; |
| 860 | #endif | ||
| 859 | }; | 861 | }; |
| 860 | 862 | ||
| 861 | 863 | ||