From: Søren Sandmann <sandmann@redhat.com>
Date: Sun, 8 Jun 2008 23:24:28 +0000 (-0400)
Subject: Add prefixes to global primitive regions
X-Git-Tag: pixman-0.11.2~1^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c22df027d6b9c9957e73ea9e34f14d504deb9d91;p=platform%2Fupstream%2Fpixman.git

Add prefixes to global primitive regions
---

diff --git a/pixman/pixman-region.c b/pixman/pixman-region.c
index 8cf9564..a98c6fe 100644
--- a/pixman/pixman-region.c
+++ b/pixman/pixman-region.c
@@ -79,13 +79,13 @@ SOFTWARE.
 #undef MAX
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 
-static const box_type_t _pixman_region_emptyBox = {0, 0, 0, 0};
-static const region_data_type_t _pixman_region_emptyData = {0, 0};
-static const region_data_type_t _pixman_brokendata = {0, 0};
+static const box_type_t PREFIX(pixman_region_emptyBox_) = {0, 0, 0, 0};
+static const region_data_type_t PREFIX(pixman_region_emptyData_) = {0, 0};
+static const region_data_type_t PREFIX(pixman_region_brokendata_) = {0, 0};
 
-static box_type_t *pixman_region_emptyBox = (box_type_t *)&_pixman_region_emptyBox;
-static region_data_type_t *pixman_region_emptyData = (region_data_type_t *)&_pixman_region_emptyData;
-static region_data_type_t *pixman_brokendata = (region_data_type_t *)&_pixman_brokendata;
+static box_type_t *pixman_region_emptyBox = (box_type_t *)&PREFIX(pixman_region_emptyBox_);
+static region_data_type_t *pixman_region_emptyData = (region_data_type_t *)&PREFIX(pixman_region_emptyData_);
+static region_data_type_t *pixman_brokendata = (region_data_type_t *)&PREFIX(pixman_region_brokendata_);
 
 /* This function exists only to make it possible to preserve the X ABI - it should
  * go away at first opportunity.