From 3cd36dae288ac0923f214b8ae81dbfc0f4d5b1b0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=B8ren=20Sandmann?= <sandmann@redhat.com>
Date: Sat, 16 Jun 2007 21:23:20 -0400
Subject: [PATCH] Slight tweak to the definition of pixman_composeFunctions

---
 pixman/pixman-compose.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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
 {
-- 
2.7.4