merge from trunk

2 files changed, 9 insertions, 0 deletions

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  <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 1a7cdb88db5..67bf15bddd1 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11959,6 +11959,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.