aboutsummaryrefslogtreecommitdiff
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
parentdd3106ef1c7503f6567a580031cfd1cf58ccb877 (diff)
Only define MIN if it's undefined.
Note: it is defined in GNU libc (Linux) and FreeBSD and OSX sys/param.h.
-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)
{
1198958419490473@wilder.debian.org/killed?h=master'>tags/02/f7/159519744966.32651.6561198958419490473@wilder.debian.org/killed0
-rw-r--r--tags/02/f7/159519744966.32651.6561198958419490473@wilder.debian.org/unread0
-rw-r--r--tags/02/f7/20141123131438.4676.12537@bastian.jones.dk/debian0
-rw-r--r--tags/02/f7/20141123131438.4676.12537@bastian.jones.dk/jones0
-rw-r--r--tags/02/f7/20141123131438.4676.12537@bastian.jones.dk/sent0
-rw-r--r--tags/02/f7/20141123131438.4676.12537@bastian.jones.dk/signed0
-rw-r--r--tags/02/f7/20180423110002.68A028912@lxp5.free-owl.de/sys0
-rw-r--r--tags/02/f7/20180423110002.68A028912@lxp5.free-owl.de/unread0
-rw-r--r--tags/02/f7/4A281794.2010108@zytor.com/sugar0
-rw-r--r--tags/02/f7/56CB4486.7080301@softwarefreedom.org/debian0
-rw-r--r--tags/02/f7/56CB4486.7080301@softwarefreedom.org/inbox0
-rw-r--r--tags/02/f7/56CB4486.7080301@softwarefreedom.org/old0
-rw-r--r--tags/02/f7/56CB4486.7080301@softwarefreedom.org/signed0
-rw-r--r--tags/02/f7/5742024C.6060906@debian.org/debian0
-rw-r--r--tags/02/f7/5742024C.6060906@debian.org/inbox0
-rw-r--r--tags/02/f7/5742024C.6060906@debian.org/old0
-rw-r--r--tags/02/f7/87ty5zf20f.fsf@frosties.localnet/debian0
-rw-r--r--tags/02/f7/CAHeRLWsQYiB1C-pd0=Yd_jxPUULOC4FJ9rRKhSVK4MCLTT6NRw@mail.gmail.com/unread0
-rw-r--r--tags/02/f7/CAP4q7BPq_WP-K8ge3bZuBYWf=nar1-HKkAtYumnGBQg1sryc1g@mail.gmail.com/debian0
-rw-r--r--tags/02/f7/CAP4q7BPq_WP-K8ge3bZuBYWf=nar1-HKkAtYumnGBQg1sryc1g@mail.gmail.com/epfsug0
-rw-r--r--tags/02/f7/E1ctRkB-0000V7-Kj@moszumanska.debian.org/debian0
-rw-r--r--tags/02/f7/E1ctRkB-0000V7-Kj@moszumanska.debian.org/inbox0
-rw-r--r--tags/02/f7/E1ctRkB-0000V7-Kj@moszumanska.debian.org/old0
-rw-r--r--tags/02/f7/E1jCya4-0000pj-U5@respighi.debian.org/debian0
-rw-r--r--tags/02/f7/E1jCya4-0000pj-U5@respighi.debian.org/inbox0
-rw-r--r--tags/02/f7/E1jCya4-0000pj-U5@respighi.debian.org/killed0
-rw-r--r--tags/02/f7/E1jCya4-0000pj-U5@respighi.debian.org/unread0
-rw-r--r--tags/02/f7/Y7xKyyLFwJHttW7E@jadzia.comodo.priv.at/debian0
-rw-r--r--tags/02/f7/Y7xKyyLFwJHttW7E@jadzia.comodo.priv.at/signed0
-rw-r--r--tags/02/f7/Y7xKyyLFwJHttW7E@jadzia.comodo.priv.at/unread0
-rw-r--r--tags/02/f7/e0ac1b7f0f203dcb2ed2c4de4f08fb37c848ce5e.camel@debian.org/debian0
-rw-r--r--tags/02/f7/e0ac1b7f0f203dcb2ed2c4de4f08fb37c848ce5e.camel@debian.org/unread0
36 files changed, 0 insertions, 0 deletions