diff options
author | John MacFarlane <jgm@berkeley.edu> | 2014-10-24 20:15:04 -0700 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2014-10-24 20:15:04 -0700 |
commit | 7f0d1a80c7871a97dcf6495fba9f0e3c8d86be81 (patch) | |
tree | 1b9af06baefe98d500899c936db57859f916a31c | |
parent | c818df9888d452f0ae54b3a504eefdd970fd73d8 (diff) | |
parent | 1a03c5f6fd2eb2aa0eee4d2c820e2578908d1dd3 (diff) |
Merge branch 'abduelhamit-master'
-rw-r--r-- | src/buffer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/buffer.c b/src/buffer.c index 2e32720..1cdcae8 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -19,6 +19,10 @@ 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) { buf->asize = 0; |