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 /video/out/gl_common.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 'video/out/gl_common.c')
| -rw-r--r-- | video/out/gl_common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/video/out/gl_common.c b/video/out/gl_common.c index 10e806dc8d..d39a09df16 100644 --- a/video/out/gl_common.c +++ b/video/out/gl_common.c @@ -142,14 +142,14 @@ static bool is_software_gl(GL *gl) strcmp(renderer, "Mesa X11") == 0; } -#ifdef HAVE_LIBDL +#if HAVE_LIBDL #include <dlfcn.h> #endif void *mp_getdladdr(const char *s) { void *ret = NULL; -#ifdef HAVE_LIBDL +#if HAVE_LIBDL void *handle = dlopen(NULL, RTLD_LAZY); if (!handle) return NULL; @@ -852,18 +852,18 @@ struct backend { }; static struct backend backends[] = { -#ifdef CONFIG_GL_COCOA +#if HAVE_GL_COCOA {"cocoa", mpgl_set_backend_cocoa}, #endif -#ifdef CONFIG_GL_WIN32 +#if HAVE_GL_WIN32 {"win", mpgl_set_backend_w32}, #endif //Add the wayland backend before x11, in order to probe for a wayland-server before a x11-server and avoid using xwayland -#ifdef CONFIG_GL_WAYLAND +#if HAVE_GL_WAYLAND {"wayland", mpgl_set_backend_wayland}, #endif -#ifdef CONFIG_GL_X11 +#if HAVE_GL_X11 {"x11", mpgl_set_backend_x11}, #endif {0} |