From cfd6fea109e26f79781ca1404e12f20efee6697c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Abd=C3=BClhamit=20Yilmaz?= <mr.yilmaz@gmx.de>
Date: Mon, 13 Oct 2014 12:10:56 +0200
Subject: Add missing MIN directive

It's needed in strbuf_cmp().
---
 src/buffer.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/buffer.c b/src/buffer.c
index 7c2b86b..67677d5 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -19,6 +19,8 @@ unsigned char strbuf__oom[1];
 	if ((d) > buf->asize && strbuf_grow(b, (d)) < 0)\
 		return -1;
 
+#define MIN(x,y)  ((x<y) ? x : y)
+
 void strbuf_init(strbuf *buf, int initial_size)
 {
 	buf->asize = 0;
-- 
cgit v1.2.3


From 1a03c5f6fd2eb2aa0eee4d2c820e2578908d1dd3 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Fri, 24 Oct 2014 20:13:51 -0700
Subject: Only define MIN if it's undefined.

Note: it is defined in GNU libc (Linux) and FreeBSD and OSX
sys/param.h.
---
 src/buffer.c | 2 ++
 1 file changed, 2 insertions(+)

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)
 {
-- 
cgit v1.2.3