aboutsummaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorGareth McMullin2015-03-22 12:21:03 -0700
committerGareth McMullin2015-03-22 12:23:03 -0700
commita497127a8d16387ce9b9b01969ca5632b95d8e07 (patch)
tree71dee19e5fd4ef0dc14b0575843947f747b860c7 /src/include
parentc10862bff34e9fe39ec209a7e5c49903534a58d3 (diff)
Move MIN macro to general.h
Diffstat (limited to 'src/include')
-rw-r--r--src/include/general.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/include/general.h b/src/include/general.h
index cf8c1e6..c82c750 100644
--- a/src/include/general.h
+++ b/src/include/general.h
@@ -39,6 +39,8 @@
#endif
#define ALIGN(x, n) (((x) + (n) - 1) & ~((n) - 1))
+#undef MIN
+#define MIN(x, y) (((x) < (y)) ? (x) : (y))
#endif