aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarl Heuer1994-11-16 01:31:04 +0000
committerKarl Heuer1994-11-16 01:31:04 +0000
commit35e5240a6a8ab67f14484743075878ac4ec74341 (patch)
tree32a3acf4ccd0f636794bff50ed957c1951cb4dcf /src
parentc4898489b1ab455617dca28494377a7501a153d1 (diff)
downloademacs-35e5240a6a8ab67f14484743075878ac4ec74341.tar.gz
emacs-35e5240a6a8ab67f14484743075878ac4ec74341.zip
(XSCROLL_BAR): Extract from Lisp_Vector, not generic pointer.
Diffstat (limited to 'src')
-rw-r--r--src/xterm.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/xterm.h b/src/xterm.h
index 32dab48cd1b..10d376f4fd1 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -527,12 +527,13 @@ struct scroll_bar {
527}; 527};
528 528
529/* The number of elements a vector holding a struct scroll_bar needs. */ 529/* The number of elements a vector holding a struct scroll_bar needs. */
530#define SCROLL_BAR_VEC_SIZE \ 530#define SCROLL_BAR_VEC_SIZE \
531 ((sizeof (struct scroll_bar) - sizeof (EMACS_INT) - sizeof (struct Lisp_Vector *)) \ 531 ((sizeof (struct scroll_bar) \
532 - sizeof (EMACS_INT) - sizeof (struct Lisp_Vector *)) \
532 / sizeof (Lisp_Object)) 533 / sizeof (Lisp_Object))
533 534
534/* Turning a lisp vector value into a pointer to a struct scroll_bar. */ 535/* Turning a lisp vector value into a pointer to a struct scroll_bar. */
535#define XSCROLL_BAR(vec) ((struct scroll_bar *) XPNTR (vec)) 536#define XSCROLL_BAR(vec) ((struct scroll_bar *) XVECTOR (vec))
536 537
537 538
538/* Building a 32-bit C integer from two 16-bit lisp integers. */ 539/* Building a 32-bit C integer from two 16-bit lisp integers. */