From 5ea03bf5a122a6531f51e40fe654732705c6e5a1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Tue, 7 May 2013 19:47:25 +0200 Subject: [PATCH] * xfns.c: Move misplaced ifndef USE_GTK from previous checkin. --- src/ChangeLog | 4 ++++ src/xfns.c | 4 ++-- 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 @@ +2013-05-07 Jan Djärv + + * xfns.c: Move misplaced ifndef USE_GTK from previous checkin. + 2013-05-07 Paul Eggert 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. */) Return false if and only if the workarea information cannot be obtained via the _NET_WORKAREA root window property. */ -#ifndef USE_GTK - static bool x_get_net_workarea (struct x_display_info *dpyinfo, XRectangle *rect) { @@ -3864,6 +3862,8 @@ x_get_net_workarea (struct x_display_info *dpyinfo, XRectangle *rect) return result; } +#ifndef USE_GTK + struct MonitorInfo { XRectangle geom, work; int mm_width, mm_height; -- 2.39.2