aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorPaul Eggert2017-11-13 08:51:41 -0800
committerPaul Eggert2017-11-13 10:16:51 -0800
commit5d68dc9a2fd1b9b883db6bc1c226541b50de8bb1 (patch)
tree196afa86890522fcde540c618ac85e307194127b /src/window.c
parent6aa0a26b46240d79eddd7e0d275454e235a60b84 (diff)
downloademacs-5d68dc9a2fd1b9b883db6bc1c226541b50de8bb1.tar.gz
emacs-5d68dc9a2fd1b9b883db6bc1c226541b50de8bb1.zip
Change vectorlike from struct to union
* src/lisp.h (vectorlike_headed): Change from struct to union. All uses changed. Since it has only one member, this does not change semantics. This is designed to simplify future changes needed to fix bugs like Bug#29040. All uses changed.
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/window.c b/src/window.c
index cc1d2a7b36e..7f472523b49 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3733,8 +3733,8 @@ make_parent_window (Lisp_Object window, bool horflag)
3733 3733
3734 o = XWINDOW (window); 3734 o = XWINDOW (window);
3735 p = allocate_window (); 3735 p = allocate_window ();
3736 memcpy ((char *) p + sizeof (struct vectorlike_header), 3736 memcpy ((char *) p + sizeof (union vectorlike_header),
3737 (char *) o + sizeof (struct vectorlike_header), 3737 (char *) o + sizeof (union vectorlike_header),
3738 word_size * VECSIZE (struct window)); 3738 word_size * VECSIZE (struct window));
3739 /* P's buffer slot may change from nil to a buffer... */ 3739 /* P's buffer slot may change from nil to a buffer... */
3740 adjust_window_count (p, 1); 3740 adjust_window_count (p, 1);
@@ -6232,7 +6232,7 @@ from the top of the window. */)
6232 6232
6233struct save_window_data 6233struct save_window_data
6234 { 6234 {
6235 struct vectorlike_header header; 6235 union vectorlike_header header;
6236 Lisp_Object selected_frame; 6236 Lisp_Object selected_frame;
6237 Lisp_Object current_window; 6237 Lisp_Object current_window;
6238 Lisp_Object f_current_buffer; 6238 Lisp_Object f_current_buffer;
@@ -6260,7 +6260,7 @@ struct save_window_data
6260/* This is saved as a Lisp_Vector. */ 6260/* This is saved as a Lisp_Vector. */
6261struct saved_window 6261struct saved_window
6262{ 6262{
6263 struct vectorlike_header header; 6263 union vectorlike_header header;
6264 6264
6265 Lisp_Object window, buffer, start, pointm, old_pointm; 6265 Lisp_Object window, buffer, start, pointm, old_pointm;
6266 Lisp_Object pixel_left, pixel_top, pixel_height, pixel_width; 6266 Lisp_Object pixel_left, pixel_top, pixel_height, pixel_width;