diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2012-11-09 18:45:15 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2012-11-09 18:45:15 +0400 |
| commit | 535cc8e9fbeafed4c3e3ef6d8bbffd489fb1d1b9 (patch) | |
| tree | dd8178b31a49bdedabd0cfef4045f49912b18ecf /src/w32term.h | |
| parent | 7d377c482f6e60464c9891ee64cf6bcdf770a707 (diff) | |
Fix recently introduced crash on MS-Windows (Bug#12839).
* w32term.h (struct scroll_bar): Use convenient header.
(SCROLL_BAR_VEC_SIZE): Remove.
* w32term.c (x_scroll_bar_create): Use VECSIZE.
Diffstat (limited to 'src/w32term.h')
| -rw-r--r-- | src/w32term.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/w32term.h b/src/w32term.h index af5b37a117..72fb8a76e3 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -415,9 +415,8 @@ extern struct w32_output w32term_display; struct scroll_bar { - /* These fields are shared by all vectors. */ - EMACS_INT size_from_Lisp_Vector_struct; - struct Lisp_Vector *next_from_Lisp_Vector_struct; + /* This field is shared by all vectors. */ + struct vectorlike_header header; /* The window we're a scroll bar for. */ Lisp_Object window; @@ -460,12 +459,6 @@ struct scroll_bar { Lisp_Object fringe_extended_p; }; -/* The number of elements a vector holding a struct scroll_bar needs. */ -#define SCROLL_BAR_VEC_SIZE \ - ((sizeof (struct scroll_bar) \ - - sizeof (EMACS_INT) - sizeof (struct Lisp_Vector *)) \ - / word_size) - /* Turning a lisp vector value into a pointer to a struct scroll_bar. */ #define XSCROLL_BAR(vec) ((struct scroll_bar *) XVECTOR (vec)) |