From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Fri, 28 Jun 2013 03:41:37 +0000 (+0900)
Subject: Fix W32-specific part of last change.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1992^2~4
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b8075603a4cb816aa44fe1b334ecb166ac7d0b5d;p=emacs.git

Fix W32-specific part of last change.
---

diff --git a/src/image.c b/src/image.c
index 52aa743e4c7..8381ce06b93 100644
--- a/src/image.c
+++ b/src/image.c
@@ -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);