[Emacs-diffs] trunk r117958: * xfns.c (x_default_scroll_bar_color_parameter):

[Paul Eggert]

------------------------------------------------------------
revno: 117958
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2014-09-26 09:49:10 -0700
message:
  * xfns.c (x_default_scroll_bar_color_parameter):
  
  Use USE_LOCAL_ALLOCA only if USE_TOOLKIT_SCROLL_BARS,
  to pacify --enable-gcc-warnings in non-scrollbar builds.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xfns.c                     xfns.c-20091113204419-o5vbwnq5f7feedwu-274

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-09-26 07:06:35 +0000
+++ b/src/ChangeLog     2014-09-26 16:49:10 +0000
@@ -1,3 +1,9 @@
+2014-09-26  Paul Eggert  <address@hidden>
+
+       * xfns.c (x_default_scroll_bar_color_parameter):
+       Use USE_LOCAL_ALLOCA only if USE_TOOLKIT_SCROLL_BARS,
+       to pacify --enable-gcc-warnings in non-scrollbar builds.
+
 2014-09-26  Ken Brown  <address@hidden>
 
        * w32term.h (ALIGN_STACK): Fix the cpp condition.

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2014-09-25 07:01:35 +0000
+++ b/src/xfns.c        2014-09-26 16:49:10 +0000
@@ -1559,7 +1559,9 @@
                                      const char *xprop, const char *xclass,
                                      int foreground_p)
 {
+#ifdef USE_TOOLKIT_SCROLL_BARS
   USE_LOCAL_ALLOCA;
+#endif
   struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (f);
   Lisp_Object tem;