[cairo-commit] cairo/pixman/src pixman-remap.h,1.6,1.7

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/pixman/src
In directory gabe:/tmp/cvs-serv22442/pixman/src

Modified Files:
	pixman-remap.h 
Log Message:

2005-11-21  Carl Worth  <cworth at cworth.org>

        * src/pixman-remap.h: Remove duplicate definitions of
        pixman_color_to_pixel and pixman_composite.


Index: pixman-remap.h
===================================================================
RCS file: /cvs/cairo/cairo/pixman/src/pixman-remap.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pixman-remap.h	18 Nov 2005 17:15:44 -0000	1.6
+++ pixman-remap.h	21 Nov 2005 19:46:40 -0000	1.7
@@ -1,10 +1,8 @@
 #define pixman_add_trapezoids _cairo_pixman_add_trapezoids
 #define pixman_color_to_pixel _cairo_pixman_color_to_pixel
-#define pixman_color_to_pixel _cairo_pixman_color_to_pixel
 #define composeFunctions _cairo_pixman_compose_functions
 #define fbComposeSetupMMX _cairo_pixman_compose_setup_mmx
 #define pixman_composite _cairo_pixman_composite
-#define pixman_composite _cairo_pixman_composite
 #define fbCompositeCopyAreammx _cairo_pixman_composite_copy_area_mmx
 #define fbCompositeSolidMask_nx8888x0565Cmmx _cairo_pixman_composite_solid_mask_nx8888x0565Cmmx
 #define fbCompositeSolidMask_nx8888x8888Cmmx _cairo_pixman_composite_solid_mask_nx8888x8888Cmmx