From: Kristian Høgsberg <krh@bitplanet.net>
Date: Mon, 29 Nov 2010 13:13:35 +0000 (-0500)
Subject: Define MULT outside the HAVE_CAIRO_GL #ifdef
X-Git-Tag: 0.85.0~369
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f5d507596eabd5d76166288f83b02f260302596;p=platform%2Fupstream%2Fwayland.git

Define MULT outside the HAVE_CAIRO_GL #ifdef
---

diff --git a/clients/window.c b/clients/window.c
index bc76937..ae55819 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -161,6 +161,9 @@ struct surface_data {
 	struct wl_buffer *buffer;
 };
 
+#define MULT(_d,c,a,t) \
+	do { t = c * a + 0x7f; _d = ((t >> 8) + t) >> 8; } while (0)
+
 #ifdef HAVE_CAIRO_GL
 
 struct drm_surface_data {
@@ -282,9 +285,6 @@ display_create_drm_surface_from_file(struct display *display,
 		while (p < end) {
 			unsigned int t;
 
-#define MULT(_d,c,a,t) \
-	do { t = c * a + 0x7f; _d = ((t >> 8) + t) >> 8; } while (0)
-
 			MULT(p[0], p[0], p[3], t);
 			MULT(p[1], p[1], p[3], t);
 			MULT(p[2], p[2], p[3], t);