svn commit: r296332 - in head/contrib/jemalloc: include/jemalloc/internal src

[Jason Evans]

Author: jasone
Date: Thu Mar  3 01:30:28 2016
New Revision: 296332
URL: https://svnweb.freebsd.org/changeset/base/296332

Log:
  Add a cast to prevent a compiler warning.

Modified:
  head/contrib/jemalloc/include/jemalloc/internal/nstime.h
  head/contrib/jemalloc/src/arena.c

Modified: head/contrib/jemalloc/include/jemalloc/internal/nstime.h
==============================================================================
--- head/contrib/jemalloc/include/jemalloc/internal/nstime.h	Thu Mar  3 01:12:13 2016	(r296331)
+++ head/contrib/jemalloc/include/jemalloc/internal/nstime.h	Thu Mar  3 01:30:28 2016	(r296332)
@@ -7,7 +7,7 @@
 typedef struct nstime_s nstime_t;
 
 /* Maximum supported number of seconds (~584 years). */
-#define	NSTIME_SEC_MAX	18446744072
+#define	NSTIME_SEC_MAX	KQU(18446744072)
 
 #endif /* JEMALLOC_H_TYPES */
 /******************************************************************************/

Modified: head/contrib/jemalloc/src/arena.c
==============================================================================
--- head/contrib/jemalloc/src/arena.c	Thu Mar  3 01:12:13 2016	(r296331)
+++ head/contrib/jemalloc/src/arena.c	Thu Mar  3 01:30:28 2016	(r296332)
@@ -1352,7 +1352,7 @@ static bool
 arena_decay_time_valid(ssize_t decay_time)
 {
 
-	return (decay_time >= -1 && decay_time <= NSTIME_SEC_MAX);
+	return (decay_time >= -1 && (uint64_t)decay_time <= NSTIME_SEC_MAX);
 }
 
 ssize_t