From 37388ebb0ef9085c841d7f94e665a5a77cfe0e92 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Tue, 16 Jul 2013 13:28:28 +0200 Subject: configure: uniform the defines to #define HAVE_xxx (0|1) The configure followed 5 different convetions of defines because the next guy always wanted to introduce a new better way to uniform it[1]. For an hypothetic feature 'hurr' you could have had: * #define HAVE_HURR 1 / #undef HAVE_DURR * #define HAVE_HURR / #undef HAVE_DURR * #define CONFIG_HURR 1 / #undef CONFIG_DURR * #define HAVE_HURR 1 / #define HAVE_DURR 0 * #define CONFIG_HURR 1 / #define CONFIG_DURR 0 All is now uniform and uses: * #define HAVE_HURR 1 * #define HAVE_DURR 0 We like definining to 0 as opposed to `undef` bcause it can help spot typos and is very helpful when doing big reorganizations in the code. [1]: http://xkcd.com/927/ related --- sub/ass_mp.h | 4 ++-- sub/dec_sub.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sub') diff --git a/sub/ass_mp.h b/sub/ass_mp.h index 52c793c9b7..27d09d8acd 100644 --- a/sub/ass_mp.h +++ b/sub/ass_mp.h @@ -36,7 +36,7 @@ // m_color argument #define MP_ASS_COLOR(c) MP_ASS_RGBA((c).r, (c).g, (c).b, (c).a) -#ifdef CONFIG_ASS +#if HAVE_LIBASS #include #include @@ -62,5 +62,5 @@ struct sub_bitmaps; void mp_ass_render_frame(ASS_Renderer *renderer, ASS_Track *track, double time, struct sub_bitmap **parts, struct sub_bitmaps *res); -#endif /* CONFIG_ASS */ +#endif /* HAVE_LIBASS */ #endif /* MPLAYER_ASS_MP_H */ diff --git a/sub/dec_sub.c b/sub/dec_sub.c index 4bc39e51c8..1a6cc6b0aa 100644 --- a/sub/dec_sub.c +++ b/sub/dec_sub.c @@ -41,7 +41,7 @@ extern const struct sd_functions sd_lavf_srt; extern const struct sd_functions sd_lavc_conv; static const struct sd_functions *sd_list[] = { -#ifdef CONFIG_ASS +#if HAVE_LIBASS &sd_ass, #endif &sd_lavc, -- cgit v1.2.3