pango r2692 - in trunk: . pango

[behdad svn gnome org]

Author: behdad
Date: Wed Aug 20 03:07:18 2008
New Revision: 2692
URL: http://svn.gnome.org/viewvc/pango?rev=2692&view=rev

Log:
2008-08-18  Behdad Esfahbod  <behdad gnome org>

        * pango/pango-language.h:
        * pango/pango-script.h:
        Fix cyclic header ordering and move pango_language_* to
        pango-language.h

Modified:
   trunk/ChangeLog
   trunk/pango/pango-language.h
   trunk/pango/pango-script.h

Modified: trunk/pango/pango-language.h
==============================================================================
--- trunk/pango/pango-language.h	(original)
+++ trunk/pango/pango-language.h	Wed Aug 20 03:07:18 2008
@@ -27,7 +27,6 @@
 
 G_BEGIN_DECLS
 
-/* Dummy typedef - internally it's a 'const char *' */
 typedef struct _PangoLanguage PangoLanguage;
 
 #define PANGO_TYPE_LANGUAGE (pango_language_get_type ())
@@ -44,6 +43,11 @@
 gboolean      pango_language_matches  (PangoLanguage *language,
 				       const char *range_list) G_GNUC_PURE;
 
+#include <pango/pango-script.h>
+
+gboolean       pango_language_includes_script   (PangoLanguage *language,
+						 PangoScript    script) G_GNUC_PURE;
+
 G_END_DECLS
 
 #endif /* __PANGO_LANGUAGE_H__ */

Modified: trunk/pango/pango-script.h
==============================================================================
--- trunk/pango/pango-script.h	(original)
+++ trunk/pango/pango-script.h	Wed Aug 20 03:07:18 2008
@@ -24,8 +24,6 @@
 
 #include <glib.h>
 
-#include <pango/pango-language.h>
-
 G_BEGIN_DECLS
 
 /**
@@ -137,9 +135,9 @@
 gboolean         pango_script_iter_next      (PangoScriptIter      *iter);
 void             pango_script_iter_free      (PangoScriptIter      *iter);
 
+#include <pango/pango-language.h>
+
 PangoLanguage *pango_script_get_sample_language (PangoScript    script) G_GNUC_PURE;
-gboolean       pango_language_includes_script   (PangoLanguage *language,
-						 PangoScript    script) G_GNUC_PURE;
 
 G_END_DECLS