[Emacs-diffs] trunk r114207: * xdisp.c (Ftool_bar_lines_needed): Declare as 'const' if ifdeffed out,

[Paul Eggert]

------------------------------------------------------------
revno: 114207
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2013-09-11 03:24:48 -0700
message:
  * xdisp.c (Ftool_bar_lines_needed): Declare as 'const' if ifdeffed out,
  
  avoiding a GCC warning.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-11 08:56:33 +0000
+++ b/src/ChangeLog     2013-09-11 10:24:48 +0000
@@ -1,3 +1,8 @@
+2013-09-11  Paul Eggert  <address@hidden>
+
+       * xdisp.c (Ftool_bar_lines_needed): Declare as 'const' if ifdeffed out,
+       avoiding a GCC warning.
+
 2013-09-11  Dmitry Antipov  <address@hidden>
 
        Ifdef away frame tool bar code when it is not really used.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-09-11 08:56:33 +0000
+++ b/src/xdisp.c       2013-09-11 10:24:48 +0000
@@ -11903,6 +11903,10 @@
 
 #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.