* xdisp.c (Ftool_bar_lines_needed): Declare as 'const' if ifdeffed out,

avoiding a GCC warning.

diff --git a/src/ChangeLog b/src/ChangeLog
index 83e5dbcdaffaba8e8a04e2e4c120bf27995d1bec..6e527b996ddf0deb424e47b47a7dfc5b703294d2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * xdisp.c (Ftool_bar_lines_needed): Declare as 'const' if ifdeffed out,
+       avoiding a GCC warning.
+
 2013-09-11  Dmitry Antipov  <dmantipov@yandex.ru>
 
        Ifdef away frame tool bar code when it is not really used.

diff --git a/src/xdisp.c b/src/xdisp.c
index 484f95164fb86a3a244f4105ff3ce06b4ae6f625..58316a0667fcac2f288897b815bd9356e45d016d 100644 (file)
--- 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.