From 8630721ec93c38b9ddacfe2a529e69ec10400eef Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 4 Nov 2006 03:21:40 +0000 Subject: [PATCH] * xmenu.c (Fmenu_bar_open): Declare variable before BLOCK_INPUT to avoid gcc 2.95 error. --- src/ChangeLog | 5 +++++ src/xmenu.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0d6f6838e8e..94e1e02f7f2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-11-03 Giorgos Keramidas (tiny change) + + * xmenu.c (Fmenu_bar_open): Declare variable before BLOCK_INPUT to + avoid gcc 2.95 error. + 2006-11-03 Chong Yidong * gtkutil.c (update_frame_tool_bar): If icon image is invalid and diff --git a/src/xmenu.c b/src/xmenu.c index d049fb99c66..7c397fbd6e1 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1395,8 +1395,10 @@ If FRAME is nil or not given, use the selected frame. */) Lisp_Object frame; { GtkWidget *menubar; + FRAME_PTR f; + BLOCK_INPUT; - FRAME_PTR f = check_x_frame (frame); + f = check_x_frame (frame); if (FRAME_EXTERNAL_MENU_BAR (f)) set_frame_menubar (f, 0, 1); -- 2.39.2