summaryrefslogtreecommitdiffstats
path: root/libc
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-02-17 10:57:56 -0800
committerElliott Hughes <enh@google.com>2014-02-17 10:57:56 -0800
commitcfbfe7059ca4e44291d065ccd4da436aedff5a73 (patch)
tree80981a799b4bcd402c77397c538c9368266453c8 /libc
parent95b808c4ae11ea5737fee63f7b61673483ea5e2d (diff)
downloadbionic-cfbfe7059ca4e44291d065ccd4da436aedff5a73.zip
bionic-cfbfe7059ca4e44291d065ccd4da436aedff5a73.tar.gz
bionic-cfbfe7059ca4e44291d065ccd4da436aedff5a73.tar.bz2
Remove duplicate definitions of MIN and MAX.
These were needed when bionic's header files were missing these macros (though it would have made a lot more sense to just fix the header files!) but cause warnings now. Change-Id: I65a677122f4f6bd07dffc3f37a0c4c0e823d1bb0
Diffstat (limited to 'libc')
-rw-r--r--libc/bionic/fts.c2
-rw-r--r--libc/netbsd/net/getnameinfo.c1
2 files changed, 0 insertions, 3 deletions
diff --git a/libc/bionic/fts.c b/libc/bionic/fts.c
index c7770b6..177652f 100644
--- a/libc/bionic/fts.c
+++ b/libc/bionic/fts.c
@@ -40,8 +40,6 @@
#include <string.h>
#include <unistd.h>
-#define MAX(a,b) ((a)>(b)?(a):(b))
-
static FTSENT *fts_alloc(FTS *, char *, size_t);
static FTSENT *fts_build(FTS *, int);
static void fts_lfree(FTSENT *);
diff --git a/libc/netbsd/net/getnameinfo.c b/libc/netbsd/net/getnameinfo.c
index 15d2675..d6c4488 100644
--- a/libc/netbsd/net/getnameinfo.c
+++ b/libc/netbsd/net/getnameinfo.c
@@ -67,7 +67,6 @@ __RCSID("$NetBSD: getnameinfo.c,v 1.53 2012/09/26 23:13:00 christos Exp $");
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
-#define MIN(x,y) ((x) < (y) ? (x) : (y))
#include <stddef.h>
#include <string.h>