summaryrefslogtreecommitdiffstats
path: root/src/util.c
diff options
context:
space:
mode:
authorJason Evans <jasone@canonware.com>2016-12-04 06:48:43 (GMT)
committerJason Evans <jasone@canonware.com>2016-12-04 06:48:43 (GMT)
commitf1f76357313e7dcad7262f17a48ff0a2e005fcdc (patch)
tree826e5a42621cbd8abc9e7473437f223faccc2b0c /src/util.c
parent0110fa8451af905affd77c3bea0d545fee2251b2 (diff)
parent2d1bb8980fff829c58dabbf122224f577879a32c (diff)
downloadjemalloc-4.4.0.zip
jemalloc-4.4.0.tar.gz
jemalloc-4.4.0.tar.bz2
Merge branch 'rc-4.4.0'4.4.0
Diffstat (limited to 'src/util.c')
-rwxr-xr-x[-rw-r--r--]src/util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util.c b/src/util.c
index 7905267..dd8c236 100644..100755
--- a/src/util.c
+++ b/src/util.c
@@ -49,7 +49,7 @@ static void
wrtmessage(void *cbopaque, const char *s)
{
-#if defined(JEMALLOC_HAVE_SYSCALL) && defined(SYS_write)
+#if defined(JEMALLOC_USE_SYSCALL) && defined(SYS_write)
/*
* Use syscall(2) rather than write(2) when possible in order to avoid
* the possibility of memory allocation within libc. This is necessary
@@ -200,7 +200,7 @@ malloc_strtoumax(const char *restrict nptr, char **restrict endptr, int base)
p++;
}
if (neg)
- ret = -ret;
+ ret = (uintmax_t)(-((intmax_t)ret));
if (p == ns) {
/* No conversion performed. */