aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2016-08-02 20:46:30 -0400
committerPaul Eggert2016-08-02 20:47:37 -0400
commit07e9281f7a17f47493a5f611f6c6ea40fa286614 (patch)
tree3080be522fc8d9220418e4842bc2f33bafa81636 /src
parent49e0c276b2e47bbc987d35dc73e80eb1efc99ef7 (diff)
downloademacs-07e9281f7a17f47493a5f611f6c6ea40fa286614.tar.gz
emacs-07e9281f7a17f47493a5f611f6c6ea40fa286614.zip
Port window changes to --enable-gcc-warnings
* src/window.c (sanitize_window_sizes): Return void. This pacifies GCC, and no caller uses the return value anyway.
Diffstat (limited to 'src')
-rw-r--r--src/window.c4
-rw-r--r--src/window.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/window.c b/src/window.c
index 2ed83f4627e..a3fbffc450d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2867,11 +2867,11 @@ resize_root_window (Lisp_Object window, Lisp_Object delta,
2867 horizontal, ignore, pixelwise); 2867 horizontal, ignore, pixelwise);
2868} 2868}
2869 2869
2870Lisp_Object 2870void
2871sanitize_window_sizes (Lisp_Object frame, Lisp_Object horizontal) 2871sanitize_window_sizes (Lisp_Object frame, Lisp_Object horizontal)
2872{ 2872{
2873 if (!NILP (Fsymbol_function (Qwindow__sanitize_window_sizes))) 2873 if (!NILP (Fsymbol_function (Qwindow__sanitize_window_sizes)))
2874 return call1 (Qwindow__sanitize_window_sizes, horizontal); 2874 call1 (Qwindow__sanitize_window_sizes, horizontal);
2875} 2875}
2876 2876
2877 2877
diff --git a/src/window.h b/src/window.h
index 1fd19369c33..268e0f2c1b0 100644
--- a/src/window.h
+++ b/src/window.h
@@ -1105,7 +1105,7 @@ extern int window_body_width (struct window *w, bool);
1105extern void temp_output_buffer_show (Lisp_Object); 1105extern void temp_output_buffer_show (Lisp_Object);
1106extern void replace_buffer_in_windows (Lisp_Object); 1106extern void replace_buffer_in_windows (Lisp_Object);
1107extern void replace_buffer_in_windows_safely (Lisp_Object); 1107extern void replace_buffer_in_windows_safely (Lisp_Object);
1108extern Lisp_Object sanitize_window_sizes (Lisp_Object, Lisp_Object); 1108extern void sanitize_window_sizes (Lisp_Object, Lisp_Object);
1109/* This looks like a setter, but it is a bit special. */ 1109/* This looks like a setter, but it is a bit special. */
1110extern void wset_buffer (struct window *, Lisp_Object); 1110extern void wset_buffer (struct window *, Lisp_Object);
1111extern bool window_outdated (struct window *); 1111extern bool window_outdated (struct window *);