[Emacs-diffs] /srv/bzr/emacs/trunk r112503: * xfns.c (x_get_net_workarea): Define only if !GTK || GTK<3.4.

[Paul Eggert]

------------------------------------------------------------
revno: 112503
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2013-05-07 12:25:42 -0700
message:
  * xfns.c (x_get_net_workarea): Define only if !GTK || GTK<3.4.
  
  This fixes a problem introduced by my previous change.
modified:
  src/ChangeLog
  src/xfns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-05-07 19:15:08 +0000
+++ b/src/ChangeLog     2013-05-07 19:25:42 +0000
@@ -1,3 +1,8 @@
+2013-05-07  Paul Eggert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * lread.c (readchar): Don't read from a dead buffer.  (Bug#14280)

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2013-05-07 17:47:25 +0000
+++ b/src/xfns.c        2013-05-07 19:25:42 +0000
@@ -3804,6 +3804,7 @@
    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 @@
 
   return result;
 }
+#endif
 
 #ifndef USE_GTK