From: Søren Sandmann <sandmann@redhat.com>
Date: Sun, 17 Jun 2007 01:23:20 +0000 (-0400)
Subject: Slight tweak to the definition of pixman_composeFunctions
X-Git-Tag: pixman-0.9.4~34
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3cd36dae288ac0923f214b8ae81dbfc0f4d5b1b0;p=platform%2Fupstream%2Fpixman.git

Slight tweak to the definition of pixman_composeFunctions
---

diff --git a/pixman/pixman-compose.c b/pixman/pixman-compose.c
index c2f2278..80831cd 100644
--- a/pixman/pixman-compose.c
+++ b/pixman/pixman-compose.c
@@ -3028,20 +3028,19 @@ static void fbFetch(bits_image_t * pict, int x, int y, int width, uint32_t *buff
 #ifdef PIXMAN_FB_ACCESSORS
 #define PIXMAN_COMPOSITE_RECT_GENERAL pixman_composite_rect_general_accessors
 #define PIXMAN_COMPOSE_FUNCTIONS pixman_composeFunctions_accessors
-static const FbComposeFunctions pixman_composeFunctions_accessors = {
-    pixman_fbCombineFuncU,
-    pixman_fbCombineFuncC,
-    pixman_fbCombineMaskU
-};
 #else
 #define PIXMAN_COMPOSITE_RECT_GENERAL pixman_composite_rect_general_no_accessors
 #define PIXMAN_COMPOSE_FUNCTIONS pixman_composeFunctions
-FbComposeFunctions pixman_composeFunctions = {
+#endif
+
+#ifdef PIXMAN_FB_ACCESSORS	/* The accessor version can't be parameterized from outside */
+static const
+#endif
+FbComposeFunctions PIXMAN_COMPOSE_FUNCTIONS = {
     pixman_fbCombineFuncU,
     pixman_fbCombineFuncC,
     pixman_fbCombineMaskU
 };
-#endif
 
 typedef struct
 {