* frame.c (x_set_frame_parameters): Port --enable-gcc-warnings

to Ubuntu 14.04.1 x86-64.

diff --git a/src/ChangeLog b/src/ChangeLog
index ae4200e7d094a3da4799d5e4acbe84d17c2fb5ac..761303a0471143cbb27422b1912426d66400283c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2014-09-30  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * frame.c (x_set_frame_parameters): Port --enable-gcc-warnings
+       to Ubuntu 14.04.1 x86-64.
+
        Simplify stack-allocated Lisp objects, and make them more portable.
        The build_local_string macro was used in two ways: (1) string
        literals for which scoped allocation suffices, and (2) file name

diff --git a/src/frame.c b/src/frame.c
index 9bc52f1e88f96f9b0580354a0c80b8bc8103bb27..4b2ffd11e7a1a3efe7e5e16f1df114958aa17010 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -2988,7 +2988,7 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist)
   /* If both of these parameters are present, it's more efficient to
      set them both at once.  So we wait until we've looked at the
      entire list before we set them.  */
-  int width, height IF_LINT (= 0);
+  int width IF_LINT (= 0), height IF_LINT (= 0);
   bool width_change = 0, height_change = 0;
 
   /* Same here.  */