From d4dc812380f937908e466bfab52bfcc3b5334ebe Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <sandmann@redhat.com>
Date: Fri, 19 Jun 2009 13:19:02 -0400
Subject: [PATCH] Get rid of pixman_region_internal_set_static_pointers()

Instead just define the function in pixman-region16.c
---
 pixman/pixman-private.h  |  3 ---
 pixman/pixman-region.c   | 18 ------------------
 pixman/pixman-region16.c | 26 ++++++++++++++++++--------
 3 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 9d91889..a23ed9c 100644
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -768,9 +768,6 @@ pixman_bool_t pixman_region32_copy_from_region16 (pixman_region32_t *dst,
 						  pixman_region16_t *src);
 pixman_bool_t pixman_region16_copy_from_region32 (pixman_region16_t *dst,
 						  pixman_region32_t *src);
-void pixman_region_internal_set_static_pointers (pixman_box16_t *empty_box,
-						 pixman_region16_data_t *empty_data,
-						 pixman_region16_data_t *broken_data);
 
 #ifdef PIXMAN_TIMERS
 
diff --git a/pixman/pixman-region.c b/pixman/pixman-region.c
index dec2c9d..d448266 100644
--- a/pixman/pixman-region.c
+++ b/pixman/pixman-region.c
@@ -87,24 +87,6 @@ static box_type_t *pixman_region_emptyBox = (box_type_t *)&PREFIX(_emptyBox_);
 static region_data_type_t *pixman_region_emptyData = (region_data_type_t *)&PREFIX(_emptyData_);
 static region_data_type_t *pixman_brokendata = (region_data_type_t *)&PREFIX(_brokendata_);
 
-/* This function exists only to make it possible to preserve the X ABI - it should
- * go away at first opportunity.
- *
- * The problem is that the X ABI exports the three structs and has used
- * them through macros. So the X server calls this function with
- * the addresses of those structs which makes the existing code continue to
- * work.
- */
-void
-PREFIX(_internal_set_static_pointers) (box_type_t *empty_box,
-				       region_data_type_t *empty_data,
-				       region_data_type_t *broken_data)
-{
-    pixman_region_emptyBox = empty_box;
-    pixman_region_emptyData = empty_data;
-    pixman_brokendata = broken_data;
-}
-
 static pixman_bool_t
 pixman_break (region_type_t *pReg);
 
diff --git a/pixman/pixman-region16.c b/pixman/pixman-region16.c
index acee094..2925b19 100644
--- a/pixman/pixman-region16.c
+++ b/pixman/pixman-region16.c
@@ -42,14 +42,6 @@ typedef struct {
 
 #define PREFIX(x) pixman_region##x
 
-PIXMAN_EXPORT void
-pixman_region_set_static_pointers (pixman_box16_t *empty_box,
-				   pixman_region16_data_t *empty_data,
-				   pixman_region16_data_t *broken_data)
-{
-    pixman_region_internal_set_static_pointers (empty_box, empty_data, broken_data);
-}
-
 pixman_bool_t
 pixman_region16_copy_from_region32 (pixman_region16_t *dst,
 				    pixman_region32_t *src)
@@ -81,3 +73,21 @@ pixman_region16_copy_from_region32 (pixman_region16_t *dst,
 }
 
 #include "pixman-region.c"
+
+/* This function exists only to make it possible to preserve the X ABI - it should
+ * go away at first opportunity.
+ *
+ * The problem is that the X ABI exports the three structs and has used
+ * them through macros. So the X server calls this function with
+ * the addresses of those structs which makes the existing code continue to
+ * work.
+ */
+PIXMAN_EXPORT void
+pixman_region_set_static_pointers (pixman_box16_t *empty_box,
+				   pixman_region16_data_t *empty_data,
+				   pixman_region16_data_t *broken_data)
+{
+    pixman_region_emptyBox = empty_box;
+    pixman_region_emptyData = empty_data;
+    pixman_brokendata = broken_data;
+}
-- 
2.7.4