From e6f87e34ee65c805bde5805f89ac362095e9df4c Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Thu, 6 Mar 2008 21:59:28 +0000 Subject: Fix compilation for installed libintl.h in include paths Compilation of xine-lib-1.2 hg failed for me as libintl.h does this: #define textdomain libintl_textdomain This causes trouble accessing fields in structures which are accidentally named "textdomain". The patch renames textdomain to text_domain in xine headers and xine- engine/xine.c and xine/load_plugins.c --- include/xine/audio_decoder.h | 2 +- include/xine/audio_out.h | 2 +- include/xine/demux.h | 2 +- include/xine/input_plugin.h | 2 +- include/xine/post.h | 2 +- include/xine/spu_decoder.h | 2 +- include/xine/video_decoder.h | 2 +- include/xine/video_out.h | 2 +- src/xine-engine/load_plugins.c | 2 +- src/xine-engine/xine.c | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/xine/audio_decoder.h b/include/xine/audio_decoder.h index 49194e290..05d29823d 100644 --- a/include/xine/audio_decoder.h +++ b/include/xine/audio_decoder.h @@ -61,7 +61,7 @@ struct audio_decoder_class_s { /** * @brief Optional non-standard catalog to use with dgettext() for description. */ - const char *textdomain; + const char *text_domain; /* * free all class-related resources diff --git a/include/xine/audio_out.h b/include/xine/audio_out.h index b720110bf..25e5deb68 100644 --- a/include/xine/audio_out.h +++ b/include/xine/audio_out.h @@ -258,7 +258,7 @@ struct audio_driver_class_s { /** * @brief Optional non-standard catalog to use with dgettext() for description. */ - const char *textdomain; + const char *text_domain; /* * free all class-related resources diff --git a/include/xine/demux.h b/include/xine/demux.h index 35a5c9a82..72808f76d 100644 --- a/include/xine/demux.h +++ b/include/xine/demux.h @@ -66,7 +66,7 @@ struct demux_class_s { /** * @brief Optional non-standard catalog to use with dgettext() for description. */ - const char *textdomain; + const char *text_domain; /** * @brief MIME types supported for this plugin diff --git a/include/xine/input_plugin.h b/include/xine/input_plugin.h index e434dc5a8..95fc65c4e 100644 --- a/include/xine/input_plugin.h +++ b/include/xine/input_plugin.h @@ -60,7 +60,7 @@ struct input_class_s { /** * @brief Optional non-standard catalog to use with dgettext() for description. */ - const char *textdomain; + const char *text_domain; /* * ls function, optional: may be NULL diff --git a/include/xine/post.h b/include/xine/post.h index 10844d03a..a8f721a9a 100644 --- a/include/xine/post.h +++ b/include/xine/post.h @@ -65,7 +65,7 @@ struct post_class_s { /** * @brief Optional non-standard catalog to use with dgettext() for description. */ - const char *textdomain; + const char *text_domain; /* * free all class-related resources diff --git a/include/xine/spu_decoder.h b/include/xine/spu_decoder.h index d36b5b691..1833a22b4 100644 --- a/include/xine/spu_decoder.h +++ b/include/xine/spu_decoder.h @@ -62,7 +62,7 @@ struct spu_decoder_class_s { /** * @brief Optional non-standard catalog to use with dgettext() for description. */ - const char *textdomain; + const char *text_domain; /* * free all class-related resources diff --git a/include/xine/video_decoder.h b/include/xine/video_decoder.h index 916cfe68b..022c2af33 100644 --- a/include/xine/video_decoder.h +++ b/include/xine/video_decoder.h @@ -62,7 +62,7 @@ struct video_decoder_class_s { /** * @brief Optional non-standard catalog to use with dgettext() for description. */ - const char *textdomain; + const char *text_domain; /* * free all class-related resources diff --git a/include/xine/video_out.h b/include/xine/video_out.h index 02eff3cac..0bdd0f557 100644 --- a/include/xine/video_out.h +++ b/include/xine/video_out.h @@ -403,7 +403,7 @@ struct video_driver_class_s { /** * @brief Optional non-standard catalog to use with dgettext() for description. */ - const char *textdomain; + const char *text_domain; /* * free all class-related resources diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 8e4a10a60..46535ef33 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -2403,7 +2403,7 @@ const char *const *xine_list_post_plugins_typed(xine_t *xine, uint32_t type) { else \ return NULL; \ } \ - return dgettext(ic->textdomain ? : XINE_TEXTDOMAIN, ic->description); \ + return dgettext(ic->text_domain ? : XINE_TEXTDOMAIN, ic->description); \ } \ } \ return NULL; \ diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 16d39b2b0..18a9e8e9f 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -885,7 +885,7 @@ static int open_internal (xine_stream_t *stream, const char *mrl) { int res; xine_log (stream->xine, XINE_LOG_MSG, _("xine: found input plugin : %s\n"), - dgettext(stream->input_plugin->input_class->textdomain ? : XINE_TEXTDOMAIN, + dgettext(stream->input_plugin->input_class->text_domain ? : XINE_TEXTDOMAIN, stream->input_plugin->input_class->description)); if (stream->input_plugin->input_class->eject_media) stream->eject_class = stream->input_plugin->input_class; @@ -1235,7 +1235,7 @@ static int open_internal (xine_stream_t *stream, const char *mrl) { } xine_log (stream->xine, XINE_LOG_MSG, _("xine: found demuxer plugin: %s\n"), - dgettext(stream->demux_plugin->demux_class->textdomain ? : XINE_TEXTDOMAIN, + dgettext(stream->demux_plugin->demux_class->text_domain ? : XINE_TEXTDOMAIN, stream->demux_plugin->demux_class->description)); _x_extra_info_reset( stream->current_extra_info ); -- cgit v1.2.3