[Emacs-diffs] /srv/bzr/emacs/trunk r112500: * xfns.c: Move misplaced ifndef USE_GTK from previous checkin.

[Jan D.]

------------------------------------------------------------
revno: 112500
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Tue 2013-05-07 19:47:25 +0200
message:
  * xfns.c: Move misplaced ifndef USE_GTK from previous checkin.
modified:
  src/ChangeLog
  src/xfns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-05-07 05:34:01 +0000
+++ b/src/ChangeLog     2013-05-07 17:47:25 +0000
@@ -1,3 +1,7 @@
+2013-05-07  Jan Djärv  <address@hidden>
+
+       * xfns.c: Move misplaced ifndef USE_GTK from previous checkin.
+
 2013-05-07  Paul Eggert  <address@hidden>
 
        Static checking by GCC 4.8.0.

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2013-05-07 05:34:01 +0000
+++ b/src/xfns.c        2013-05-07 17:47:25 +0000
@@ -3804,8 +3804,6 @@
    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 @@
   return result;
 }
 
+#ifndef USE_GTK
+
 struct MonitorInfo {
   XRectangle geom, work;
   int mm_width, mm_height;