diff options
| author | Michael Clark <michael@metaparadigm.com> | 2009-07-25 00:13:44 +0000 |
|---|---|---|
| committer | Michael Clark <michael@metaparadigm.com> | 2009-07-25 00:13:44 +0000 |
| commit | 7fb9b03ffdc5942c4e542b53f2bf96f4d36d3059 (patch) | |
| tree | 6a4d5f2a600529aeac532d03ef33519e42cd39f3 /printbuf.c | |
| parent | b1a22ac85f8251688f77da52d000958fab3a8d66 (diff) | |
| download | json-c-7fb9b03ffdc5942c4e542b53f2bf96f4d36d3059.tar.gz | |
* Rename min and max so we can never clash with C or C++ std library
Ian Atha, thatha at yahoo-inc dot com
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@43 327403b1-1117-474d-bef2-5cb71233fd97
Diffstat (limited to 'printbuf.c')
| -rw-r--r-- | printbuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -49,7 +49,7 @@ int printbuf_memappend(struct printbuf *p, const char *buf, int size) { char *t; if(p->size - p->bpos <= size) { - int new_size = max(p->size * 2, p->bpos + size + 8); + int new_size = json_max(p->size * 2, p->bpos + size + 8); #ifdef PRINTBUF_DEBUG MC_DEBUG("printbuf_memappend: realloc " "bpos=%d wrsize=%d old_size=%d new_size=%d\n", |