diff options
author | Behdad Esfahbod <behdad@gnome.org> | 2006-02-05 23:48:28 +0000 |
---|---|---|
committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-02-05 23:48:28 +0000 |
commit | 3293001b8aa09a4e812af974b389843c952871bb (patch) | |
tree | 4f5641caed2c5806162f7aff3ef1219db030ec65 /pango | |
parent | ca73084fad58044f6219fce2e5d0c497f4bbeac0 (diff) | |
download | pango-3293001b8aa09a4e812af974b389843c952871bb.tar.gz |
AC_DEFINE various version components.
2006-02-05 Behdad Esfahbod <behdad@gnome.org>
* configure.in: AC_DEFINE various version components.
* *.c: Change various const return types to G_CONST_RETURN.
Diffstat (limited to 'pango')
-rw-r--r-- | pango/pango-fontmap.c | 2 | ||||
-rw-r--r-- | pango/pango-layout.c | 2 | ||||
-rw-r--r-- | pango/pango-utils.h | 1 | ||||
-rw-r--r-- | pango/pangocairo-fontmap.c | 4 | ||||
-rw-r--r-- | pango/pangoft2.c | 2 | ||||
-rw-r--r-- | pango/pangox-fontmap.c | 4 |
6 files changed, 7 insertions, 8 deletions
diff --git a/pango/pango-fontmap.c b/pango/pango-fontmap.c index 4d458445..b6991c9d 100644 --- a/pango/pango-fontmap.c +++ b/pango/pango-fontmap.c @@ -240,7 +240,7 @@ pango_font_map_real_load_fontset (PangoFontMap *fontmap, * * Since: 1.4 **/ -const char * +G_CONST_RETURN char * pango_font_map_get_shape_engine_type (PangoFontMap *fontmap) { g_return_val_if_fail (PANGO_IS_FONT_MAP (fontmap), NULL); diff --git a/pango/pango-layout.c b/pango/pango-layout.c index ba555b8c..9befbf65 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -863,7 +863,7 @@ pango_layout_set_text (PangoLayout *layout, * * Return value: the text in the @layout. **/ -const char* +G_CONST_RETURN char* pango_layout_get_text (PangoLayout *layout) { g_return_val_if_fail (PANGO_IS_LAYOUT (layout), NULL); diff --git a/pango/pango-utils.h b/pango/pango-utils.h index f8e775e2..00d4889e 100644 --- a/pango/pango-utils.h +++ b/pango/pango-utils.h @@ -102,7 +102,6 @@ gboolean pango_is_zero_width (gunichar ch) G_GNUC_CONST; /* String interning for static strings */ #define I_(string) g_intern_static_string (string) - G_END_DECLS #endif /* __PANGO_UTILS_H__ */ diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c index 6eb4a63b..b7525b1a 100644 --- a/pango/pangocairo-fontmap.c +++ b/pango/pangocairo-fontmap.c @@ -397,7 +397,7 @@ pango_cairo_context_set_font_options (PangoContext *context, * if no options have been set. This value is owned by the context * and must not be modified or freed. **/ -const cairo_font_options_t * +G_CONST_RETURN cairo_font_options_t * pango_cairo_context_get_font_options (PangoContext *context) { PangoCairoContextInfo *info; @@ -423,7 +423,7 @@ pango_cairo_context_get_font_options (PangoContext *context) * Return value: the combined set of font options. This value is owned * by the context and must not be modified or freed. **/ -const cairo_font_options_t * +G_CONST_RETURN cairo_font_options_t * _pango_cairo_context_get_merged_font_options (PangoContext *context) { PangoCairoContextInfo *info = get_context_info (context, TRUE); diff --git a/pango/pangoft2.c b/pango/pangoft2.c index be53cac4..ad23a106 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -503,7 +503,7 @@ ft_error_compare (const void *pkey, return ((ft_error_description *) pkey)->code - ((ft_error_description *) pbase)->code; } -const char * +G_CONST_RETURN char * _pango_ft2_ft_strerror (FT_Error error) { #undef __FTERRORS_H__ diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c index b073b4ec..e5bdb9c0 100644 --- a/pango/pangox-fontmap.c +++ b/pango/pangox-fontmap.c @@ -1429,7 +1429,7 @@ pango_x_fontmap_atom_from_name (PangoFontMap *fontmap, } -const char * +G_CONST_RETURN char * pango_x_fontmap_name_from_atom (PangoFontMap *fontmap, Atom atom) { @@ -1633,7 +1633,7 @@ pango_x_family_list_faces (PangoFontFamily *family, } } -const char * +G_CONST_RETURN char * pango_x_family_get_name (PangoFontFamily *family) { PangoXFamily *xfamily = PANGO_X_FAMILY (family); |