procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* xfns.c (x_get_net_workarea): Define only if !GTK || GTK<3.4.

Browse source 
This fixes a problem introduced by my previous change.
This commit is contained in:
Paul Eggert 2013-05-07 12:25:42 -07:00
parent 15acfe419f
commit 2b66427ded
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2013-05-07 Paul Eggert <eggert@cs.ucla.edu>
* xfns.c (x_get_net_workarea): Define only if !GTK || GTK<3.4.
This fixes a problem introduced by my previous change.
2013-05-07 Glenn Morris <rgm@gnu.org>
* lread.c (readchar): Don't read from a dead buffer. (Bug#14280)

2
src/xfns.c
View file

@ -3804,6 +3804,7 @@ If omitted or nil, that stands for the selected frame's display. */)
Return false if and only if the workarea information cannot be
obtained via the _NET_WORKAREA root window property. */
#if !defined USE_GTK || GTK_MAJOR_VERSION < 3 + (GTK_MINOR_VERSION < 4)
static bool
x_get_net_workarea (struct x_display_info *dpyinfo, XRectangle *rect)
{
@ -3861,6 +3862,7 @@ x_get_net_workarea (struct x_display_info *dpyinfo, XRectangle *rect)
return result;
}
#endif
#ifndef USE_GTK