From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 3 Aug 2016 00:46:30 +0000 (-0400)
Subject: Port window changes to --enable-gcc-warnings
X-Git-Tag: emacs-26.0.90~1813
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=07e9281f7a17f47493a5f611f6c6ea40fa286614;p=emacs.git

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.
---

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,
 		horizontal, ignore, pixelwise);
 }
 
-Lisp_Object
+void
 sanitize_window_sizes (Lisp_Object frame, Lisp_Object horizontal)
 {
   if (!NILP (Fsymbol_function (Qwindow__sanitize_window_sizes)))
-    return call1 (Qwindow__sanitize_window_sizes, horizontal);
+    call1 (Qwindow__sanitize_window_sizes, horizontal);
 }
 
 
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);
 extern void temp_output_buffer_show (Lisp_Object);
 extern void replace_buffer_in_windows (Lisp_Object);
 extern void replace_buffer_in_windows_safely (Lisp_Object);
-extern Lisp_Object sanitize_window_sizes (Lisp_Object, Lisp_Object);
+extern void sanitize_window_sizes (Lisp_Object, Lisp_Object);
 /* This looks like a setter, but it is a bit special.  */
 extern void wset_buffer (struct window *, Lisp_Object);
 extern bool window_outdated (struct window *);