From 4c8c1960df8f7a74e096b7eb0efc9b5302c5d5a5 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 24 Feb 2000 04:17:51 +0000 Subject: [PATCH] 2000-02-23 Roland McGrath * iconv/loop.c: Don't include . On Hurd it includes -> defines ES, conflicting with iconvdata/iso646.c's (unrelated) ES. (MIN): New macro, just define it here instead to avoid that conflict. --- iconv/loop.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/iconv/loop.c b/iconv/loop.c index baf57531d15..5c5a8e64d62 100644 --- a/iconv/loop.c +++ b/iconv/loop.c @@ -46,10 +46,11 @@ */ #include -#include /* For MIN. */ #define __need_size_t #include +#define MIN(a,b) (((a)<(b))?(a):(b)) + /* We need at least one byte for the next round. */ #ifndef MIN_NEEDED_INPUT -- 2.47.2