]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix W32-specific part of last change.
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Fri, 28 Jun 2013 03:41:37 +0000 (12:41 +0900)
committerYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Fri, 28 Jun 2013 03:41:37 +0000 (12:41 +0900)
src/image.c

index 52aa743e4c7ee7c331b55dd38fe7bc246bf6eb96..8381ce06b9356f8a7fd6b8343925fb2d13ff0c2f 100644 (file)
@@ -2181,10 +2181,13 @@ image_get_x_image_or_dc (struct frame *f, struct image *img, bool mask_p,
 
   release_frame_dc (f, frame_dc);
   *prev = SelectObject (ximg, !mask_p ? img->pixmap : img->mask);
+
+  return ximg;
 }
 
-static void image_unget_x_image_or_dc (struct frame *img, bool mask_p,
-                                      XImagePtr_or_DC ximg, HGDIOBJ prev)
+static void
+image_unget_x_image_or_dc (struct image *img, bool mask_p,
+                          XImagePtr_or_DC ximg, HGDIOBJ prev)
 {
   SelectObject (ximg, prev);
   DeleteDC (ximg);