From f5dacaaec042fe230859469ebd5e307f78448ac4 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 11 Sep 2013 03:24:48 -0700 Subject: [PATCH] * xdisp.c (Ftool_bar_lines_needed): Declare as 'const' if ifdeffed out, avoiding a GCC warning. --- src/ChangeLog | 5 +++++ src/xdisp.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 83e5dbcdaff..6e527b996dd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-09-11 Paul Eggert + + * xdisp.c (Ftool_bar_lines_needed): Declare as 'const' if ifdeffed out, + avoiding a GCC warning. + 2013-09-11 Dmitry Antipov Ifdef away frame tool bar code when it is not really used. diff --git a/src/xdisp.c b/src/xdisp.c index 484f95164fb..58316a0667f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -11903,6 +11903,10 @@ tool_bar_lines_needed (struct frame *f, int *n_rows) #endif /* !USE_GTK && !HAVE_NS */ +#if defined USE_GTK || defined HAVE_NS +EXFUN (Ftool_bar_lines_needed, 1) ATTRIBUTE_CONST; +#endif + DEFUN ("tool-bar-lines-needed", Ftool_bar_lines_needed, Stool_bar_lines_needed, 0, 1, 0, doc: /* Return the number of lines occupied by the tool bar of FRAME. -- 2.39.2