Mercurial > hg
changeset 17359:d7753a0bb0cd
Merge
| author | Bryan O'Sullivan <bryano@fb.com> |
|---|---|
| date | Tue, 14 Aug 2012 08:12:09 -0700 |
| parents | 511dfb34b412 (diff) 2917f82f6040 (current diff) |
| children | 5e276d1d504a |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/parsers.c Tue Aug 14 08:11:15 2012 -0700 +++ b/mercurial/parsers.c Tue Aug 14 08:12:09 2012 -0700 @@ -9,6 +9,7 @@ #include <Python.h> #include <ctype.h> +#include <stddef.h> #include <string.h> #include "util.h" @@ -72,7 +73,7 @@ for (start = cur = str, zero = NULL; cur < str + len; cur++) { PyObject *file = NULL, *node = NULL; PyObject *flags = NULL; - int nlen; + ptrdiff_t nlen; if (!*cur) { zero = cur; @@ -94,7 +95,7 @@ nlen = cur - zero - 1; - node = unhexlify(zero + 1, nlen > 40 ? 40 : nlen); + node = unhexlify(zero + 1, nlen > 40 ? 40 : (int)nlen); if (!node) goto bail;