From cfbfe7059ca4e44291d065ccd4da436aedff5a73 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 17 Feb 2014 10:57:56 -0800 Subject: [PATCH] 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 --- libc/bionic/fts.c | 2 -- libc/netbsd/net/getnameinfo.c | 1 - 2 files changed, 3 deletions(-) diff --git a/libc/bionic/fts.c b/libc/bionic/fts.c index c7770b6b6..177652fd9 100644 --- a/libc/bionic/fts.c +++ b/libc/bionic/fts.c @@ -40,8 +40,6 @@ #include #include -#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 15d267570..d6c448864 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 #include #include -#define MIN(x,y) ((x) < (y) ? (x) : (y)) #include #include