aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-10-24 20:13:51 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2014-10-24 20:13:51 -0700
commit1a03c5f6fd2eb2aa0eee4d2c820e2578908d1dd3 (patch)
tree1b9af06baefe98d500899c936db57859f916a31c /src
parentdd3106ef1c7503f6567a580031cfd1cf58ccb877 (diff)
Only define MIN if it's undefined.
Note: it is defined in GNU libc (Linux) and FreeBSD and OSX sys/param.h.
Diffstat (limited to 'src')
-rw-r--r--src/buffer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/buffer.c b/src/buffer.c
index aab1f08..1cdcae8 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -19,7 +19,9 @@ unsigned char strbuf__oom[1];
if ((d) > buf->asize && strbuf_grow(b, (d)) < 0) \
return -1;
+#ifndef MIN
#define MIN(x,y) ((x<y) ? x : y)
+#endif
void strbuf_init(strbuf *buf, int initial_size)
{