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 /include | |
| 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 'include')
| -rw-r--r-- | include/xine/audio_decoder.h | 2 | ||||
| -rw-r--r-- | include/xine/audio_out.h | 2 | ||||
| -rw-r--r-- | include/xine/demux.h | 2 | ||||
| -rw-r--r-- | include/xine/input_plugin.h | 2 | ||||
| -rw-r--r-- | include/xine/post.h | 2 | ||||
| -rw-r--r-- | include/xine/spu_decoder.h | 2 | ||||
| -rw-r--r-- | include/xine/video_decoder.h | 2 | ||||
| -rw-r--r-- | include/xine/video_out.h | 2 |
8 files changed, 8 insertions, 8 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 |