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.

9 files changed, 21 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index ab231f8d..03b94fc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2006-02-04  Behdad Esfahbod  <behdad@gnome.org>
 
 	Bug 324408 – tab can result in 0 characters
diff --git a/configure.in b/configure.in
index a9dc9509..7778d077 100644
--- a/configure.in
+++ b/configure.in
@@ -32,10 +32,8 @@ m4_define([pango_interface_age], [2])
 dnl Number of releases since we've broken binary compatibility.
 m4_define([pango_binary_age],
           [m4_eval(100 * pango_minor_version + pango_micro_version)])
-dnl This is the last version with which we have compatibility with
-dnl with the modules for; it isn't the same as
-dnl PANGO_API_VERSION.'PANGO_MICRO_VERSION - PANGO_BINARY_AGE' since we have
-dnl engine only API    
+dnl Module API version.  This should be stepped up when a change causes
+dnl older modules to not work with new pango.
 m4_define([pango_module_version], [1.5.0])
 
 
@@ -67,6 +65,11 @@ AC_SUBST(PANGO_BINARY_AGE)
 AC_SUBST(PANGO_MODULE_VERSION)
 
 AC_DEFINE(MODULE_VERSION, "pango_module_version()", [Module interface version])
+AC_DEFINE(PANGO_BINARY_AGE, pango_binary_age(), [PANGO binary age])
+AC_DEFINE(PANGO_INTERFACE_AGE, pango_interface_age(), [PANGO interface age])
+AC_DEFINE(PANGO_MAJOR_VERSION, pango_major_version(), [PANGO major version])
+AC_DEFINE(PANGO_MINOR_VERSION, pango_minor_version(), [PANGO minor version])
+AC_DEFINE(PANGO_MICRO_VERSION, pango_micro_version(), [PANGO micro version])
 
 dnl libtool versioning
 m4_define([lt_current], [m4_eval(100 * pango_minor_version + pango_micro_version - pango_interface_age)])
diff --git a/modules/hebrew/hebrew-shaper.c b/modules/hebrew/hebrew-shaper.c
index 5fe000c8..a9260071 100644
--- a/modules/hebrew/hebrew-shaper.c
+++ b/modules/hebrew/hebrew-shaper.c
@@ -215,7 +215,7 @@ static const gint Unicode_shape_table[128] = {
 #define	is_composible(cur_wc, nxt_wc)	(compose_table[char_type_table[ucs2iso8859_8 (cur_wc)]]\
 						      [char_type_table[ucs2iso8859_8 (nxt_wc)]])
 
-const char *
+G_CONST_RETURN char *
 hebrew_shaper_get_next_cluster(const char      *text,
 			       gint		length,
 			       gunichar        *cluster,
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);