Move PANGO_GLYPH_EMPTY, PANGO_GLYPH_UNKNOWN_FLAG, and

2006-02-17  Behdad Esfahbod  <behdad@gnome.org>

        * pango/pango-types.h, pango/pango-font.h: Move PANGO_GLYPH_EMPTY,
        PANGO_GLYPH_UNKNOWN_FLAG, and PANGO_GET_UNKNOWN_GLYPH from the former
        to the latter, and only define if PANGO_ENABLE_ENGINE or
        PANGO_ENABLE_BACKEND is set.

diff --git a/ChangeLog b/ChangeLog
index 4accbd4..c73dcda 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-17  Behdad Esfahbod  <behdad@gnome.org>
+
+       * pango/pango-types.h, pango/pango-font.h: Move PANGO_GLYPH_EMPTY,
+       PANGO_GLYPH_UNKNOWN_FLAG, and PANGO_GET_UNKNOWN_GLYPH from the former
+       to the latter, and only define if PANGO_ENABLE_ENGINE or
+       PANGO_ENABLE_BACKEND is set.
+
 2006-02-15  Behdad Esfahbod  <behdad@gnome.org>
 
        Bug 331038 – pango-querymodules --help and --version

diff --git a/pango/pango-font.h b/pango/pango-font.h
index f75add6..58d796a 100644 (file)
--- a/pango/pango-font.h
+++ b/pango/pango-font.h
@@ -365,6 +365,13 @@ struct _PangoFontClass
 
 #endif /* PANGO_ENABLE_BACKEND */
 
+#if defined(PANGO_ENABLE_ENGINE) || defined(PANGO_ENABLE_BACKEND)
+#define PANGO_GLYPH_EMPTY           ((PangoGlyph)0x0FFFFFFF)
+#define PANGO_GLYPH_UNKNOWN_FLAG    ((PangoGlyph)0x10000000)
+#define PANGO_GET_UNKNOWN_GLYPH(wc) ((PangoGlyph)(wc)|PANGO_GLYPH_UNKNOWN_FLAG)
+#endif
+
+
 G_END_DECLS
 
 #endif /* __PANGO_FONT_H__ */

diff --git a/pango/pango-types.h b/pango/pango-types.h
index 7d12dac..6a198a6 100644 (file)
--- a/pango/pango-types.h
+++ b/pango/pango-types.h
@@ -45,10 +45,6 @@ typedef struct _PangoLanguage PangoLanguage;
  */
 typedef guint32 PangoGlyph;
 
-#define PANGO_GLYPH_EMPTY           ((PangoGlyph)0x0FFFFFFF)
-#define PANGO_GLYPH_UNKNOWN_FLAG    ((PangoGlyph)0x10000000)
-#define PANGO_GET_UNKNOWN_GLYPH(wc) ((PangoGlyph)(wc)|PANGO_GLYPH_UNKNOWN_FLAG)
-
 /* A rectangle. Used to store logical and physical extents of glyphs,
  * runs, strings, etc.
  */