Index: io/io_buf.c
===================================================================
RCS file: /cvs/public/parrot/io/io_buf.c,v
retrieving revision 1.6
diff -u -r1.6 io_buf.c
--- io/io_buf.c 21 Jul 2003 18:00:45 -0000 1.6
+++ io/io_buf.c 29 Jul 2003 18:31:39 -0000
@@ -62,9 +62,6 @@
size_t PIO_buf_readthru(theINTERP, ParrotIOLayer *layer,
ParrotIO *io, void *buffer, size_t len);
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-
/* XXX: This is not portable */
#define IS_EOL(c) ((*c) == '\n')
@@ -292,7 +289,7 @@
if (b->flags & PIO_BF_READBUF) {
size_t avail = b->endb - b->next;
- current = MIN(avail, len);
+ current = avail < len ? avail : len;
memcpy(out_buf, b->next, current);
b->next += current;
@@ -323,7 +320,7 @@
got = PIO_buf_fill_readbuf(interpreter, l, io, b);
- len = MIN(len, got);
+ len = len < got ? len : got;
}
/* read from the read_buffer */
--
Juergen Boemmels [EMAIL PROTECTED]
Fachbereich Physik Tel: ++49-(0)631-205-2817
Universitaet Kaiserslautern Fax: ++49-(0)631-205-3906
PGP Key fingerprint = 9F 56 54 3D 45 C1 32 6F 23 F6 C7 2F 85 93 DD 47
