From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Wed, 28 May 2014 15:47:13 +0000 (+0400)
Subject: * frame.h (frame_char_to_pixel_position, frame_set_mouse_position):
X-Git-Tag: emacs-25.0.90~2640^2~28
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=35a389321a70b0ce5ec81023a2ce84027235617f;p=emacs.git

* frame.h (frame_char_to_pixel_position, frame_set_mouse_position):
Fix last change by moving these functions under HAVE_WINDOW_SYSTEM.
---

diff --git a/src/frame.h b/src/frame.h
index c22b9c2a823..60d3e3680f1 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1354,17 +1354,6 @@ x_set_bitmap_icon (struct frame *f)
 
 #endif /* !HAVE_NS */
 
-#endif /* HAVE_WINDOW_SYSTEM */
-
-INLINE void
-flush_frame (struct frame *f)
-{
-  struct redisplay_interface *rif = FRAME_RIF (f);
-
-  if (rif && rif->flush_display)
-    rif->flush_display (f);
-}
-
 /* Convert character coordinates X and Y to pixel
    coordinates PIX_X and PIX_Y on frame F.  */
 
@@ -1396,6 +1385,17 @@ void frame_set_mouse_position (struct frame *f, int x, int y)
   frame_set_mouse_pixel_position (f, pix_x, pix_y);
 }
 
+#endif /* HAVE_WINDOW_SYSTEM */
+
+INLINE void
+flush_frame (struct frame *f)
+{
+  struct redisplay_interface *rif = FRAME_RIF (f);
+
+  if (rif && rif->flush_display)
+    rif->flush_display (f);
+}
+
 /***********************************************************************
 			Multimonitor data
  ***********************************************************************/