am d4bc9ef8: Merge "Remove duplicate definitions of MIN and MAX."

* commit 'd4bc9ef83b36916d5e63c4c3e4a092381473ea52':
  Remove duplicate definitions of MIN and MAX.
This commit is contained in:
Elliott Hughes 2014-03-07 19:39:37 +00:00 committed by Android Git Automerger
commit 0cc47451b8
2 changed files with 0 additions and 3 deletions

View File

@ -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 *);

View File

@ -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>