[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 1ef1dbd: Avoid compilation warning in xterm.c
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-26 1ef1dbd: Avoid compilation warning in xterm.c |
Date: |
Mon, 4 Dec 2017 15:00:40 -0500 (EST) |
branch: emacs-26
commit 1ef1dbdbc5921ec476732954cd70e8530405f208
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Avoid compilation warning in xterm.c
* src/xterm.c (x_draw_underwave): Move the declaration of
'thickness' to the non-USE_CAIRO branch, to avoid compiler
warning. (Bug#29567)
---
src/xterm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/xterm.c b/src/xterm.c
index 1b45cf1..e422168 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3517,13 +3517,13 @@ x_draw_underwave (struct glyph_string *s)
x_get_scale_factor (s->display, &scale_x, &scale_y);
- int wave_height = 3 * scale_y, wave_length = 2 * scale_x, thickness =
scale_y;
+ int wave_height = 3 * scale_y, wave_length = 2 * scale_x;
#ifdef USE_CAIRO
x_draw_horizontal_wave (s->f, s->gc, s->x, s->ybase - wave_height + 3,
s->width, wave_height, wave_length);
#else /* not USE_CAIRO */
- int dx, dy, x0, y0, width, x1, y1, x2, y2, xmax;
+ int dx, dy, x0, y0, width, x1, y1, x2, y2, xmax, thickness = scale_y;;
bool odd;
XRectangle wave_clip, string_clip, final_clip;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 1ef1dbd: Avoid compilation warning in xterm.c,
Eli Zaretskii <=