diff options
-rw-r--r-- | pango/meson.build | 9 | ||||
-rw-r--r-- | pango/pango-attributes.h | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pango/meson.build b/pango/meson.build index 15386661..777f5374 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -54,10 +54,11 @@ pango_headers = [ 'pango-tabs.h', 'pango-types.h', 'pango-utils.h', - 'pango-version-macros.h', ] -install_headers(pango_headers, subdir: pango_api_path) +pango_installed_headers = pango_headers + [ 'pango-version-macros.h' ] + +install_headers(pango_installed_headers, subdir: pango_api_path) # Features header pango_features_conf = configuration_data() @@ -67,7 +68,7 @@ pango_features_conf.set('PANGO_VERSION_MICRO', pango_micro_version) pango_features_conf.set('PANGO_API_VERSION', pango_api_version) pango_features_conf.set('PANGO_CURRENT_MINUS_AGE', '0') -configure_file( +pango_features_h = configure_file( input: 'pango-features.h.meson', output: 'pango-features.h', configuration: pango_features_conf, @@ -135,7 +136,7 @@ if build_gir endif pango_gir = gnome.generate_gir( libpango, - sources: pango_sources + pango_headers + [ pango_enum_h ], + sources: pango_sources + pango_headers + [ pango_enum_h, pango_features_h ], namespace: 'Pango', nsversion: pango_api_version, identifier_prefix: 'Pango', diff --git a/pango/pango-attributes.h b/pango/pango-attributes.h index dd38aee2..aecd1199 100644 --- a/pango/pango-attributes.h +++ b/pango/pango-attributes.h @@ -267,16 +267,17 @@ typedef enum { * * Since: 1.24 */ +#define PANGO_ATTR_INDEX_FROM_TEXT_BEGINNING ((guint)0) + /** - * PANGO_ATTR_INDEX_TO_TEXT_END: + * PANGO_ATTR_INDEX_TO_TEXT_END: (value 4294967295) * * This value can be used to set the end_index member of a #PangoAttribute * such that the attribute covers to the end of the text. * * Since: 1.24 */ -#define PANGO_ATTR_INDEX_FROM_TEXT_BEGINNING 0 -#define PANGO_ATTR_INDEX_TO_TEXT_END G_MAXUINT +#define PANGO_ATTR_INDEX_TO_TEXT_END ((guint)(G_MAXUINT + 0)) /** * PangoAttribute: |