Update for newest FreeType2. (pango_ft2_font_finalize): gcc warns about

2000-12-15  Tor Lillqvist  <tml@iki.fi>

	* pango/pangoft2.c (pango_ft2_ft_strerror): Update for newest
	FreeType2.
	(pango_ft2_font_finalize): gcc warns about empty format strings,
	so use just a space...

8 files changed, 53 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 13397cac..2f451cdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-15  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/pangoft2.c (pango_ft2_ft_strerror): Update for newest
+	FreeType2.
+	(pango_ft2_font_finalize): gcc warns about empty format strings,
+	so use just a space...
+
 2000-12-11  Havoc Pennington  <hp@redhat.com>
 
 	* tests/boundaries.utf8: Add some jamo and viramas and unicode
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 13397cac..2f451cdb 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,10 @@
+2000-12-15  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/pangoft2.c (pango_ft2_ft_strerror): Update for newest
+	FreeType2.
+	(pango_ft2_font_finalize): gcc warns about empty format strings,
+	so use just a space...
+
 2000-12-11  Havoc Pennington  <hp@redhat.com>
 
 	* tests/boundaries.utf8: Add some jamo and viramas and unicode
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 13397cac..2f451cdb 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+2000-12-15  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/pangoft2.c (pango_ft2_ft_strerror): Update for newest
+	FreeType2.
+	(pango_ft2_font_finalize): gcc warns about empty format strings,
+	so use just a space...
+
 2000-12-11  Havoc Pennington  <hp@redhat.com>
 
 	* tests/boundaries.utf8: Add some jamo and viramas and unicode
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 13397cac..2f451cdb 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,10 @@
+2000-12-15  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/pangoft2.c (pango_ft2_ft_strerror): Update for newest
+	FreeType2.
+	(pango_ft2_font_finalize): gcc warns about empty format strings,
+	so use just a space...
+
 2000-12-11  Havoc Pennington  <hp@redhat.com>
 
 	* tests/boundaries.utf8: Add some jamo and viramas and unicode
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 13397cac..2f451cdb 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,10 @@
+2000-12-15  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/pangoft2.c (pango_ft2_ft_strerror): Update for newest
+	FreeType2.
+	(pango_ft2_font_finalize): gcc warns about empty format strings,
+	so use just a space...
+
 2000-12-11  Havoc Pennington  <hp@redhat.com>
 
 	* tests/boundaries.utf8: Add some jamo and viramas and unicode
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 13397cac..2f451cdb 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+2000-12-15  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/pangoft2.c (pango_ft2_ft_strerror): Update for newest
+	FreeType2.
+	(pango_ft2_font_finalize): gcc warns about empty format strings,
+	so use just a space...
+
 2000-12-11  Havoc Pennington  <hp@redhat.com>
 
 	* tests/boundaries.utf8: Add some jamo and viramas and unicode
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 13397cac..2f451cdb 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+2000-12-15  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/pangoft2.c (pango_ft2_ft_strerror): Update for newest
+	FreeType2.
+	(pango_ft2_font_finalize): gcc warns about empty format strings,
+	so use just a space...
+
 2000-12-11  Havoc Pennington  <hp@redhat.com>
 
 	* tests/boundaries.utf8: Add some jamo and viramas and unicode
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index e1035c8f..7203df4b 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -855,7 +855,7 @@ pango_ft2_font_finalize (GObject *object)
   PangoFT2FontCache *cache = pango_ft2_font_map_get_font_cache (ft2font->fontmap);
   int i;
 
-  PING ((""));
+  PING ((" "));
 
   for (i = 0; i < ft2font->n_fonts; i++)
     {
@@ -1178,14 +1178,13 @@ ft_error_compare (const void *pkey,
 const char *
 pango_ft2_ft_strerror (FT_Error error)
 {
-#undef FTERRORS_H
+#undef __FTERRORS_H__
 #define FT_ERRORDEF( e, v, s )  { e, s },
 #define FT_ERROR_START_LIST  {
-#define FT_ERROR_END_LIST    { 0, 0 } }
+#define FT_ERROR_END_LIST    { 0, 0 } };
 
   const ft_error_description ft_errors[] =
-#include <freetype/fterrors.h>
-  ;
+#include FT_ERRORS_H
 
 #undef FT_ERRORDEF
 #undef FT_ERROR_START_LIST