# HG changeset patch # User Karl Heuer # Date 784949464 0 # Node ID 5ecf054a8c8f0edf108b6b3164636d7dbd2a987e # Parent d7735c829d7361f6184050100abe84aafb2e4d3d (XSCROLL_BAR): Extract from Lisp_Vector, not generic pointer. diff -r d7735c829d73 -r 5ecf054a8c8f src/xterm.h --- a/src/xterm.h Wed Nov 16 01:26:39 1994 +0000 +++ b/src/xterm.h Wed Nov 16 01:31:04 1994 +0000 @@ -527,12 +527,13 @@ }; /* 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 *)) \ +#define SCROLL_BAR_VEC_SIZE \ + ((sizeof (struct scroll_bar) \ + - sizeof (EMACS_INT) - sizeof (struct Lisp_Vector *)) \ / sizeof (Lisp_Object)) /* Turning a lisp vector value into a pointer to a struct scroll_bar. */ -#define XSCROLL_BAR(vec) ((struct scroll_bar *) XPNTR (vec)) +#define XSCROLL_BAR(vec) ((struct scroll_bar *) XVECTOR (vec)) /* Building a 32-bit C integer from two 16-bit lisp integers. */