aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2014-09-26 09:49:10 -0700
committerPaul Eggert2014-09-26 09:49:10 -0700
commit1f9f052c6def2f0d4c19161d6d64979d1e8aa96a (patch)
tree2f7085a8df54d5959a12041397d384af441d89f8 /src
parentc575c0509a120337d589798f5637d57d01f1f89c (diff)
downloademacs-1f9f052c6def2f0d4c19161d6d64979d1e8aa96a.tar.gz
emacs-1f9f052c6def2f0d4c19161d6d64979d1e8aa96a.zip
* 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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/xfns.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 526d2058b51..b866977a7ce 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12014-09-26 Paul Eggert <eggert@cs.ucla.edu>
2
3 * xfns.c (x_default_scroll_bar_color_parameter):
4 Use USE_LOCAL_ALLOCA only if USE_TOOLKIT_SCROLL_BARS,
5 to pacify --enable-gcc-warnings in non-scrollbar builds.
6
12014-09-26 Ken Brown <kbrown@cornell.edu> 72014-09-26 Ken Brown <kbrown@cornell.edu>
2 8
3 * w32term.h (ALIGN_STACK): Fix the cpp condition. 9 * 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,
1559 const char *xprop, const char *xclass, 1559 const char *xprop, const char *xclass,
1560 int foreground_p) 1560 int foreground_p)
1561{ 1561{
1562#ifdef USE_TOOLKIT_SCROLL_BARS
1562 USE_LOCAL_ALLOCA; 1563 USE_LOCAL_ALLOCA;
1564#endif
1563 struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (f); 1565 struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (f);
1564 Lisp_Object tem; 1566 Lisp_Object tem;
1565 1567