Backported from HEAD:

Protect inclusion of fontconfig.h with HAVE_FCFINI.
Remove stray cairo-ft.h include.
Include stddef.h for NULL.
Open the file rb.

1 files changed, 14 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 04947e907..0030c3582 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-09-26  Carl Worth  <cworth@cworth.org>
+
+	Backported from HEAD:
+	2005-08-31  Owen Taylor  <otaylor@redhat.com>
+
+	* test/cairo-test.c: Protect inclusion of fontconfig.h
+	with HAVE_FCFINI.
+
+	* test/nil-surface.c: Remove stray cairo-ft.h include.
+
+	* test/nil-surface.c: Include stddef.h for NULL.
+
+	* test/create-from-png-stream.c (draw): Open the file "rb".
+
 2005-09-26  Tor Lillqvist  <tml@novell.com>
 
 	* src/cairo-win32-font.c (_win32_scaled_font_get_scaled_hfont),