diff options
| author | Matthias Ringwald <mringwal@inf.ethz.ch> | 2008-03-06 21:59:28 +0000 |
|---|---|---|
| committer | Matthias Ringwald <mringwal@inf.ethz.ch> | 2008-03-06 21:59:28 +0000 |
| commit | e6f87e34ee65c805bde5805f89ac362095e9df4c (patch) | |
| tree | 4b54ac93a7a57ed34e6a929fb244954303dadc5e /src/xine-engine/xine.c | |
| parent | e36ec56897903031273ce381738f72140840ed66 (diff) | |
| download | xine-lib-e6f87e34ee65c805bde5805f89ac362095e9df4c.tar.gz xine-lib-e6f87e34ee65c805bde5805f89ac362095e9df4c.tar.bz2 | |
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
Diffstat (limited to 'src/xine-engine/xine.c')
| -rw-r--r-- | src/xine-engine/xine.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 ); |