diff options
author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-07-16 13:28:28 +0200 |
---|---|---|
committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-11-03 21:59:54 +0100 |
commit | 37388ebb0ef9085c841d7f94e665a5a77cfe0e92 (patch) | |
tree | b47d18bee4e7f661d9e6d794dac0ec1cebcd3a37 /mpvcore/input/input.c | |
parent | 891a2a1f474add323145e6b2cd2d29181830e4a4 (diff) | |
download | mpv-37388ebb0ef9085c841d7f94e665a5a77cfe0e92.tar.bz2 mpv-37388ebb0ef9085c841d7f94e665a5a77cfe0e92.tar.xz |
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
Diffstat (limited to 'mpvcore/input/input.c')
-rw-r--r-- | mpvcore/input/input.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mpvcore/input/input.c b/mpvcore/input/input.c index e9c628dedb..12a30dd848 100644 --- a/mpvcore/input/input.c +++ b/mpvcore/input/input.c @@ -53,15 +53,15 @@ #include "joystick.h" -#ifdef CONFIG_LIRC +#if HAVE_LIRC #include "lirc.h" #endif -#ifdef CONFIG_LIRCC +#if HAVE_LIRCC #include <lirc/lircc.h> #endif -#ifdef CONFIG_COCOA +#if HAVE_COCOA #include "osdep/macosx_events.h" #endif @@ -616,7 +616,7 @@ const m_option_t mp_input_opts[] = { OPT_FLAG("joystick", input.use_joystick, CONF_GLOBAL), OPT_FLAG("lirc", input.use_lirc, CONF_GLOBAL), OPT_FLAG("lircc", input.use_lircc, CONF_GLOBAL), -#ifdef CONFIG_COCOA +#if HAVE_COCOA OPT_FLAG("ar", input.use_ar, CONF_GLOBAL), OPT_FLAG("media-keys", input.use_media_keys, CONF_GLOBAL), #endif @@ -1734,7 +1734,7 @@ static void remove_dead_fds(struct input_ctx *ictx) } } -#ifdef HAVE_POSIX_SELECT +#if HAVE_POSIX_SELECT static void input_wait_read(struct input_ctx *ictx, int time) { @@ -2310,7 +2310,7 @@ struct input_ctx *mp_input_init(struct mpv_global *global) "input config\n"); } -#ifdef CONFIG_JOYSTICK +#if HAVE_JOYSTICK if (input_conf->use_joystick) { int fd = mp_input_joystick_init(input_conf->js_dev); if (fd < 0) @@ -2321,7 +2321,7 @@ struct input_ctx *mp_input_init(struct mpv_global *global) } #endif -#ifdef CONFIG_LIRC +#if HAVE_LIRC if (input_conf->use_lirc) { int fd = mp_input_lirc_init(); if (fd > 0) @@ -2330,7 +2330,7 @@ struct input_ctx *mp_input_init(struct mpv_global *global) } #endif -#ifdef CONFIG_LIRCC +#if HAVE_LIRCC if (input_conf->use_lircc) { int fd = lircc_init("mpv", NULL); if (fd >= 0) @@ -2338,7 +2338,7 @@ struct input_ctx *mp_input_init(struct mpv_global *global) } #endif -#ifdef CONFIG_COCOA +#if HAVE_COCOA if (input_conf->use_ar) { cocoa_init_apple_remote(); ictx->using_ar = true; @@ -2386,7 +2386,7 @@ void mp_input_uninit(struct input_ctx *ictx) if (!ictx) return; -#ifdef CONFIG_COCOA +#if HAVE_COCOA if (ictx->using_ar) { cocoa_uninit_apple_remote(); } |