From 2b66427dedba115445a06e1b9097a253222377f4 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 7 May 2013 12:25:42 -0700 Subject: [PATCH] * xfns.c (x_get_net_workarea): Define only if !GTK || GTK<3.4. This fixes a problem introduced by my previous change. --- src/ChangeLog | 5 +++++ src/xfns.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index cfa10f7bfb..4c64f14d6a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-05-07 Paul Eggert + + * 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 * lread.c (readchar): Don't read from a dead buffer. (Bug#14280) diff --git a/src/xfns.c b/src/xfns.c index 8254f3cf22..2164ff5cd7 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -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 -- 2.20.1