summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2005-11-18 10:17:29 +0000
committerCarl Worth <cworth@cworth.org>2005-11-18 10:17:29 +0000
commit36f8345a70f5a11de817b258ead23cb2379a58c0 (patch)
tree8c8004111a4a3b81124105c74163ddabbf6213e5
parentd08cabcb4c53f59e84d62cacd21d269f15c97c8a (diff)
downloadcairo-36f8345a70f5a11de817b258ead23cb2379a58c0.tar.gz
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 20843aab7..74bcd334c 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-10-12 T Rowley <tim.rowley@gmail.com>
Reviewed by: cworth
diff --git a/pixman/ChangeLog b/pixman/ChangeLog
index 65fcb56a1..ec753306f 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-09-18 Billy Biggs <vektor@dumbterm.net>
Bug #4414, reviewed by otaylor, cworth.
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