Merge pull request #654 from mogemimi/fix-macro-redefined-warning

[spine-c] Fix redefinition of macro MIN and MAX
This commit is contained in:
Mario Zechner 2016-07-29 09:46:26 +02:00 committed by GitHub
commit 0d74b10a79

View File

@ -83,8 +83,12 @@
#define SIN_DEG(A) SIN((A) * DEG_RAD)
#define COS_DEG(A) COS((A) * DEG_RAD)
#define CLAMP(x, min, max) ((x) < (min) ? (min) : ((x) > (max) ? (max) : (x)))
#ifndef MIN
#define MIN(x, y) ((x) < (y) ? (x) : (y))
#endif
#ifndef MAX
#define MAX(x, y) ((x) > (y) ? (x) : (y))
#endif
#define UNUSED(x) (void)(x)