forked from enlightenment/efl
elm: Defined the same macro, MAX and MIN, in elm_priv.h
MAX and MIN are defined in a couple of places and they was already defined in elm_priv.h. So use elm_priv.h's one. I also moved CEIL to elm_priv.h that can be used in another places.
This commit is contained in:
parent
b74c805a74
commit
98a08addc4
|
@ -14,14 +14,6 @@ EAPI Eo_Op ELM_OBJ_CONFORMANT_BASE_ID = EO_NOOP;
|
||||||
#define MY_CLASS_NAME "Elm_Conformant"
|
#define MY_CLASS_NAME "Elm_Conformant"
|
||||||
#define MY_CLASS_NAME_LEGACY "elm_conformant"
|
#define MY_CLASS_NAME_LEGACY "elm_conformant"
|
||||||
|
|
||||||
#ifndef MIN
|
|
||||||
# define MIN(a, b) ((a) < (b)) ? (a) : (b)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef MAX
|
|
||||||
# define MAX(a, b) ((a) < (b)) ? (b) : (a)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static char CONFORMANT_KEY[] = "_elm_conform_key";
|
static char CONFORMANT_KEY[] = "_elm_conform_key";
|
||||||
|
|
||||||
#define ELM_CONFORM_INDICATOR_TIME 1.0
|
#define ELM_CONFORM_INDICATOR_TIME 1.0
|
||||||
|
|
|
@ -7,14 +7,6 @@
|
||||||
#include "elm_widget_diskselector.h"
|
#include "elm_widget_diskselector.h"
|
||||||
#include "elm_interface_scrollable.h"
|
#include "elm_interface_scrollable.h"
|
||||||
|
|
||||||
#ifndef MAX
|
|
||||||
# define MAX(a, b) (((a) > (b)) ? (a) : (b))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef CEIL
|
|
||||||
#define CEIL(a) (((a) % 2 != 0) ? ((a) / 2 + 1) : ((a) / 2))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define DISPLAY_ITEM_NUM_MIN 3
|
#define DISPLAY_ITEM_NUM_MIN 3
|
||||||
|
|
||||||
EAPI Eo_Op ELM_OBJ_DISKSELECTOR_BASE_ID = EO_NOOP;
|
EAPI Eo_Op ELM_OBJ_DISKSELECTOR_BASE_ID = EO_NOOP;
|
||||||
|
|
|
@ -14,10 +14,6 @@ EAPI Eo_Op ELM_OBJ_HOVER_BASE_ID = EO_NOOP;
|
||||||
#define MY_CLASS_NAME "Elm_Hover"
|
#define MY_CLASS_NAME "Elm_Hover"
|
||||||
#define MY_CLASS_NAME_LEGACY "elm_hover"
|
#define MY_CLASS_NAME_LEGACY "elm_hover"
|
||||||
|
|
||||||
#ifndef MAX
|
|
||||||
# define MAX(a, b) (((a) > (b)) ? (a) : (b))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define ELM_HOVER_PARTS_FOREACH unsigned int i; \
|
#define ELM_HOVER_PARTS_FOREACH unsigned int i; \
|
||||||
for (i = 0; i < sizeof(sd->subs) / sizeof(sd->subs[0]); i++)
|
for (i = 0; i < sizeof(sd->subs) / sizeof(sd->subs[0]); i++)
|
||||||
|
|
||||||
|
|
|
@ -159,6 +159,9 @@ extern const char *_elm_engines[];
|
||||||
#define MIN(x, y) (((x) < (y)) ? (x) : (y))
|
#define MIN(x, y) (((x) < (y)) ? (x) : (y))
|
||||||
#undef MAX
|
#undef MAX
|
||||||
#define MAX(x, y) (((x) > (y)) ? (x) : (y))
|
#define MAX(x, y) (((x) > (y)) ? (x) : (y))
|
||||||
|
#undef CEIL
|
||||||
|
#define CEIL(a) (((a) % 2 != 0) ? ((a) / 2 + 1) : ((a) / 2))
|
||||||
|
|
||||||
|
|
||||||
#define ELM_SAFE_FREE(_h, _fn) do { _fn((void*)_h); _h = NULL; } while (0)
|
#define ELM_SAFE_FREE(_h, _fn) do { _fn((void*)_h); _h = NULL; } while (0)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue