From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 26 Sep 2014 16:49:10 +0000 (-0700)
Subject: * xfns.c (x_default_scroll_bar_color_parameter):
X-Git-Tag: emacs-25.0.90~2635^2~679^2~213
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1f9f052c6def2f0d4c19161d6d64979d1e8aa96a;p=emacs.git

* 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.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 526d2058b51..b866977a7ce 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* 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  <kbrown@cornell.edu>
 
 	* w32term.h (ALIGN_STACK): Fix the cpp condition.
diff --git a/src/xfns.c b/src/xfns.c
index 9d217cdb4d9..d6e4b7bf5ca 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1559,7 +1559,9 @@ x_default_scroll_bar_color_parameter (struct frame *f,
 				      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;