diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-09-26 09:49:10 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-09-26 09:49:10 -0700 |
| commit | 1f9f052c6def2f0d4c19161d6d64979d1e8aa96a (patch) | |
| tree | 2f7085a8df54d5959a12041397d384af441d89f8 | |
| parent | c575c0509a120337d589798f5637d57d01f1f89c (diff) | |
| download | emacs-1f9f052c6def2f0d4c19161d6d64979d1e8aa96a.tar.gz | |
* 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.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/xfns.c | 2 |
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 @@ +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; |