aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2015-04-09 17:12:42 +0200
committerFlorian Weimer <fweimer@redhat.com>2015-04-09 17:12:42 +0200
commit2902af1631c0c74c2f0c0edd7a85a523370e5027 (patch)
tree4dd685319ead16e7d8170fd632d779ac64e7275a
parent23ebf74307f5eaef450af9ef05212f3b6891e0f3 (diff)
scratch_buffer: Suppress truncation warning on 32-bit
-rw-r--r--ChangeLog5
-rw-r--r--malloc/tst-scratch_buffer.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d84b3dba6b..30dc4dabdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-09 Florian Weimer <fweimer@redhat.com>
+
+ * malloc/tst-scratch_buffer.c (do_test): Suppress truncation
+ warning on 32-bit.
+
2015-04-08 David S. Miller <davem@davemloft.net>
* sysdeps/sparc/fpu/libm-test-ulps: Update.
diff --git a/malloc/tst-scratch_buffer.c b/malloc/tst-scratch_buffer.c
index dcae5120dd..614b9b831e 100644
--- a/malloc/tst-scratch_buffer.c
+++ b/malloc/tst-scratch_buffer.c
@@ -130,8 +130,8 @@ do_test (void)
&& unchanged_array_size (&buf, 0, -1)
&& unchanged_array_size (&buf, 1ULL << 16, 0)
&& unchanged_array_size (&buf, 0, 1ULL << 16)
- && unchanged_array_size (&buf, 1ULL << 32, 0)
- && unchanged_array_size (&buf, 0, 1ULL << 32)))
+ && unchanged_array_size (&buf, (size_t) (1ULL << 32), 0)
+ && unchanged_array_size (&buf, 0, (size_t) (1ULL << 32))))
return 1;
if (!scratch_buffer_grow (&buf))
{