[Emacs-diffs] cairo ee14727: Fixes to compile cairo branch without cairo.

[Jan D.]

branch: cairo
commit ee14727ce033bae3bc11af35e7843604e5a5e635
Author: Jan D <address@hidden>
Commit: Jan D <address@hidden>

    Fixes to compile cairo branch without cairo.
    
    * src/gtkutil.c (xg_update_scrollbar_pos): x_clear_area takes frame as
    first argument.
    
    * src/xterm.c (handle_one_xevent): Surround x_cr_destroy_surface with
    USE_CAIRO.
---
 src/gtkutil.c |    3 +--
 src/xterm.c   |    2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 5d28b02..a4b4331 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -3824,8 +3824,7 @@ xg_update_scrollbar_pos (struct frame *f,
              above.  */
          oldw += (scale - 1) * oldw;
          oldx -= (scale - 1) * oldw;
-          x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                        oldx, oldy, oldw, oldh);
+          x_clear_area (f, oldx, oldy, oldw, oldh);
         }
 
       /* GTK does not redraw until the main loop is entered again, but
diff --git a/src/xterm.c b/src/xterm.c
index 8f595c8..4590e34 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8326,7 +8326,9 @@ handle_one_xevent (struct x_display_info *dpyinfo,
         {
           xg_frame_resized (f, event->xconfigure.width,
                             event->xconfigure.height);
+#ifdef USE_CAIRO
           x_cr_destroy_surface (f);
+#endif
           f = 0;
         }
 #endif