summaryrefslogtreecommitdiffstats
path: root/vm/Common.h
diff options
context:
space:
mode:
authorCarl Shapiro <cshapiro@google.com>2010-07-09 17:35:15 -0700
committerCarl Shapiro <cshapiro@google.com>2010-07-09 17:35:19 -0700
commit99fc4560d75078b92daea33795489ac477e26cda (patch)
tree55a32778c74505a6859be9e970daa8ab05cf6fb3 /vm/Common.h
parent2a6f4846b2a9e252c914e5103270fc86cc786859 (diff)
downloadandroid_dalvik-99fc4560d75078b92daea33795489ac477e26cda.tar.gz
android_dalvik-99fc4560d75078b92daea33795489ac477e26cda.tar.bz2
android_dalvik-99fc4560d75078b92daea33795489ac477e26cda.zip
Make the compiler's MIN and MAX macros globally visible.
Change-Id: Ic04aa35276df783b1d9eacede9627fd3e0b9acb6
Diffstat (limited to 'vm/Common.h')
-rw-r--r--vm/Common.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/vm/Common.h b/vm/Common.h
index d0c021d50..2f151b8fe 100644
--- a/vm/Common.h
+++ b/vm/Common.h
@@ -34,6 +34,8 @@
__FILE__, __LINE__, #x), *(int*)39=39, 0) )
#endif
+#define MIN(x,y) (((x) < (y)) ? (x) : (y))
+#define MAX(x,y) (((x) > (y)) ? (x) : (y))
/*
* If "very verbose" logging is enabled, make it equivalent to LOGV.