summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-12-12 23:45:56 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-12-12 23:45:56 +0000
commit71b19bbd8d3c3b27f2d2f526394b9473049d620a (patch)
tree0fd9c9d2330f39364e9de909e33bf9fa76ef4158
parent63ae70a1ce477a3283ccd39d30a657bd5d81f5d0 (diff)
parent74e2120b16c5fc5c72bef1437085526814772963 (diff)
downloadandroid_external_elfutils-71b19bbd8d3c3b27f2d2f526394b9473049d620a.tar.gz
android_external_elfutils-71b19bbd8d3c3b27f2d2f526394b9473049d620a.tar.bz2
android_external_elfutils-71b19bbd8d3c3b27f2d2f526394b9473049d620a.zip
Merge "Remove MIN and MAX now they're in <sys/param.h>."
-rw-r--r--0.153/bionic-fixup/AndroidFixup.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/0.153/bionic-fixup/AndroidFixup.h b/0.153/bionic-fixup/AndroidFixup.h
index db324c47..a08316be 100644
--- a/0.153/bionic-fixup/AndroidFixup.h
+++ b/0.153/bionic-fixup/AndroidFixup.h
@@ -19,14 +19,6 @@
#include <libgen.h> // for basename
-#ifndef MAX
-#define MAX(x,y) ((x) > (y) ? (x) : (y))
-#endif
-
-#ifndef MIN
-#define MIN(x,y) ((x) < (y) ? (x) : (y))
-#endif
-
/* workaround for stpcpy */
static inline char *stpcpy(char *dst, const char *src)
{