Bug 598561 - Don't rename pixman functions when system pixman is in use. r=jmuizelaar a=approval2.0

--HG--
extra : rebase_source : 7b5b80f59973a5d5fb55ae49170776f80284c9ec

config/system-headers

@@ -1041,4 +1041,6 @@ proxy.h
 #if MOZ_PLATFORM_MAEMO==6
 contentaction/contentaction.h
 #endif
-
+#ifndef MOZ_TREE_PIXMAN
+pixman.h
+#endif

gfx/cairo/cairo/src/cairo-rename.h

@@ -324,6 +324,7 @@
 #define cairo_xlib_surface_get_xrender_format _moz_cairo_xlib_surface_get_xrender_format
 #define cairo_xlib_surface_set_drawable _moz_cairo_xlib_surface_set_drawable
 #define cairo_xlib_surface_set_size _moz_cairo_xlib_surface_set_size
+#ifdef MOZ_TREE_PIXMAN
 #define pixman_region_set_static_pointers _moz_pixman_region_set_static_pointers
 #define pixman_region_init _moz_pixman_region_init
 #define pixman_region_init_rect _moz_pixman_region_init_rect
@@ -409,3 +410,4 @@
 #define pixman_add_traps _moz_pixman_add_traps
 #define pixman_add_trapezoids _moz_pixman_add_trapezoids
 #define pixman_rasterize_trapezoid _moz_pixman_rasterize_trapezoid
+#endif

js/src/config/system-headers

@@ -1041,4 +1041,7 @@ proxy.h
 #if MOZ_PLATFORM_MAEMO==6
 contentaction/contentaction.h
 #endif
+#ifndef MOZ_TREE_PIXMAN
+pixman.h
+#endif