From 7927a4a3b31d49b80bdc437c101e1155c450eb23 Mon Sep 17 00:00:00 2001 From: Wolfgang Jenkner Date: Fri, 29 May 2015 15:14:27 +0200 Subject: [PATCH] * src/xfns.c (x_set_menu_bar_lines): Fix calls to x_clear_area. The signature was changed in the cairo branch, merged on 2015-05-23. This oversight broke compiling only the non-toolkit X version. --- src/xfns.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/xfns.c b/src/xfns.c index 5ac58e9c7e0..16a568e9153 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -1084,8 +1084,7 @@ x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) y = FRAME_TOP_MARGIN_HEIGHT (f); block_input (); - x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), - 0, y, width, height); + x_clear_area (f, 0, y, width, height); unblock_input (); } @@ -1095,8 +1094,7 @@ x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) height = nlines * FRAME_LINE_HEIGHT (f) - y; block_input (); - x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), - 0, y, width, height); + x_clear_area (f, 0, y, width, height); unblock_input (); } -- 2.39.5