Moved the MIN() macro to the helper include.

Removed multiple definitions of the MIN() macro from existing
locations and unified with a single definition. Updated sources
to use the shared version.

Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
This commit is contained in:
Jon Cruz
2015-06-15 15:37:09 -07:00
committed by Bryce Harrington
parent 35b2eaa989
commit d618f688d5
6 changed files with 12 additions and 10 deletions
-2
View File
@@ -49,8 +49,6 @@
#include "shared/helpers.h"
#include "window.h"
#define MIN(x,y) (((x) < (y)) ? (x) : (y))
#ifndef EGL_WL_create_wayland_buffer_from_image
#define EGL_WL_create_wayland_buffer_from_image 1
-2
View File
@@ -36,8 +36,6 @@
#include "shared/os-compatibility.h"
#include "presentation_timing-client-protocol.h"
#define MIN(x,y) (((x) < (y)) ? (x) : (y))
typedef void (*print_info_t)(void *info);
typedef void (*destroy_info_t)(void *info);
-2
View File
@@ -5150,8 +5150,6 @@ fini_xkb(struct input *input)
xkb_keymap_unref(input->xkb.keymap);
}
#define MIN(a,b) ((a) < (b) ? a : b)
static void
display_add_input(struct display *d, uint32_t id)
{