summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2005-11-18 09:15:43 +0000
committerCarl Worth <cworth@cworth.org>2005-11-18 09:15:43 +0000
commit345ba540b1977db7e1a31f88aa8c8b2cdb32f11d (patch)
treed0eb14c2bd2ec62f98c0f6d27af0caf7985d243c
parent49136c04f2fcbf463334bf256c72b7b280e2e819 (diff)
Remove spurios INT_ prefixes which break the build with very recent binutils.
-rw-r--r--ChangeLog5
-rw-r--r--pixman/ChangeLog5
-rw-r--r--pixman/src/pixman-remap.h4
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5fddec350..51b19d49b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-18 Carl Worth <cworth@cworth.org>
+
+ * src/pixman-remap.h: Remove spurios INT_ prefixes which break the
+ build with very recent binutils.
+
2005-11-17 Stuart Parmenter <pavlov@pavlov.net>
* test/cairo-test.c: (create_win32_surface),
diff --git a/pixman/ChangeLog b/pixman/ChangeLog
index afa782ec5..0ccbf7ed8 100644
--- a/pixman/ChangeLog
+++ b/pixman/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-18 Carl Worth <cworth@cworth.org>
+
+ * src/pixman-remap.h: Remove spurios INT_ prefixes which break the
+ build with very recent binutils.
+
2005-10-09 Billy Biggs <vektor@dumbterm.net>
* src/icimage.h: Make space for the new bits needed by expand.
diff --git a/pixman/src/pixman-remap.h b/pixman/src/pixman-remap.h
index 5c2c2003a..87d9e27c6 100644
--- a/pixman/src/pixman-remap.h
+++ b/pixman/src/pixman-remap.h
@@ -1,9 +1,9 @@
#define pixman_add_trapezoids _cairo_pixman_add_trapezoids
-#define INT_pixman_color_to_pixel _cairo_pixman_color_to_pixel
+#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 INT_pixman_composite _cairo_pixman_composite
+#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