From 699aeb00d4cf6278ba59e9b1e845df20fe3cd791 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 30 Sep 2014 08:20:03 -0700 Subject: [PATCH] * frame.c (x_set_frame_parameters): Port --enable-gcc-warnings to Ubuntu 14.04.1 x86-64. --- src/ChangeLog | 3 +++ src/frame.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index ae4200e7d09..761303a0471 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2014-09-30 Paul Eggert + * 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 9bc52f1e88f..4b2ffd11e7a 100644 --- 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. */ -- 2.39.5