From: Roland McGrath <roland@gnu.org>
Date: Thu, 24 Feb 2000 04:17:51 +0000 (+0000)
Subject: 2000-02-23  Roland McGrath  <roland@baalperazim.frob.com>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c8c1960df8f7a74e096b7eb0efc9b5302c5d5a5;p=thirdparty%2Fglibc.git

2000-02-23  Roland McGrath  <roland@baalperazim.frob.com>

	* iconv/loop.c: Don't include <sys/param.h>.  On Hurd it includes
	<signal.h> -> <sys/ucontext.h> defines ES, conflicting with
	iconvdata/iso646.c's (unrelated) ES.
	(MIN): New macro, just define it here instead to avoid that conflict.
---

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 <gconv.h>
-#include <sys/param.h>		/* For MIN.  */
 #define __need_size_t
 #include <stddef.h>
 
+#define	MIN(a,b) (((a)<(b))?(a):(b))
+
 
 /* We need at least one byte for the next round.  */
 #ifndef MIN_NEEDED_INPUT