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 baf57531d15ba7465ef8c2df51fd85e99956acac..5c5a8e64d62826dafef966146eab086701ddd5ac 100644 (file)
--- 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