aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2013-05-07 19:47:25 +0200
committerJan Djärv2013-05-07 19:47:25 +0200
commit5ea03bf5a122a6531f51e40fe654732705c6e5a1 (patch)
tree83f4574fe6bafd21ac00028ac042bb8758220c6c /src
parent276e88731bb652be2e4458d32be1865437d0b575 (diff)
downloademacs-5ea03bf5a122a6531f51e40fe654732705c6e5a1.tar.gz
emacs-5ea03bf5a122a6531f51e40fe654732705c6e5a1.zip
* xfns.c: Move misplaced ifndef USE_GTK from previous checkin.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xfns.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e9629adf35a..4b71eed9c21 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-05-07 Jan Djärv <jan.h.d@swipnet.se>
2
3 * xfns.c: Move misplaced ifndef USE_GTK from previous checkin.
4
12013-05-07 Paul Eggert <eggert@cs.ucla.edu> 52013-05-07 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Static checking by GCC 4.8.0. 7 Static checking by GCC 4.8.0.
diff --git a/src/xfns.c b/src/xfns.c
index d45d113a741..8254f3cf22e 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3804,8 +3804,6 @@ If omitted or nil, that stands for the selected frame's display. */)
3804 Return false if and only if the workarea information cannot be 3804 Return false if and only if the workarea information cannot be
3805 obtained via the _NET_WORKAREA root window property. */ 3805 obtained via the _NET_WORKAREA root window property. */
3806 3806
3807#ifndef USE_GTK
3808
3809static bool 3807static bool
3810x_get_net_workarea (struct x_display_info *dpyinfo, XRectangle *rect) 3808x_get_net_workarea (struct x_display_info *dpyinfo, XRectangle *rect)
3811{ 3809{
@@ -3864,6 +3862,8 @@ x_get_net_workarea (struct x_display_info *dpyinfo, XRectangle *rect)
3864 return result; 3862 return result;
3865} 3863}
3866 3864
3865#ifndef USE_GTK
3866
3867struct MonitorInfo { 3867struct MonitorInfo {
3868 XRectangle geom, work; 3868 XRectangle geom, work;
3869 int mm_width, mm_height; 3869 int mm_width, mm_height;