diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2011-06-09 11:36:59 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2011-06-09 13:02:27 -0400 |
| commit | 4c7807daee7189f481d7c18b56b06d7b7dba7884 (patch) | |
| tree | cd8356382775b26b5402d0a6b5750fb3faba2b35 /pango/pango-language.h | |
| parent | c5a91abf1e24735be6c67dcb5d4e9ee0d66edd65 (diff) | |
| download | pango-4c7807daee7189f481d7c18b56b06d7b7dba7884.tar.gz | |
Stop using G_CONST_RETURN in Pango
G_CONST_RETURN is headed for deprecation (as per bug #644611). Stop
using it in Pango.
https://bugzilla.gnome.org/show_bug.cgi?id=652202
Diffstat (limited to 'pango/pango-language.h')
| -rw-r--r-- | pango/pango-language.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pango/pango-language.h b/pango/pango-language.h index 37cdc164..31660ca3 100644 --- a/pango/pango-language.h +++ b/pango/pango-language.h @@ -34,11 +34,11 @@ typedef struct _PangoLanguage PangoLanguage; GType pango_language_get_type (void) G_GNUC_CONST; PangoLanguage *pango_language_from_string (const char *language); -G_CONST_RETURN char *pango_language_to_string (PangoLanguage *language) G_GNUC_CONST; +const char *pango_language_to_string (PangoLanguage *language) G_GNUC_CONST; /* For back compat. Will have to keep indefinitely. */ #define pango_language_to_string(language) ((const char *)language) -G_CONST_RETURN char *pango_language_get_sample_string (PangoLanguage *language) G_GNUC_CONST; +const char *pango_language_get_sample_string (PangoLanguage *language) G_GNUC_CONST; PangoLanguage *pango_language_get_default (void) G_GNUC_CONST; gboolean pango_language_matches (PangoLanguage *language, @@ -48,7 +48,7 @@ gboolean pango_language_matches (PangoLanguage *language, gboolean pango_language_includes_script (PangoLanguage *language, PangoScript script) G_GNUC_PURE; -G_CONST_RETURN PangoScript *pango_language_get_scripts (PangoLanguage *language, +const PangoScript *pango_language_get_scripts (PangoLanguage *language, int *num_scripts); G_END_DECLS |