From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Thu, 16 Mar 2023 10:50:28 +0000 (+0100)
Subject: Explicitly declare arrays
X-Git-Tag: archive/raspbian/102.9.0esr-1_deb10u1+rpi1~2^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6d0caa8e552a8e0c5258810b8fe18bea20d1ab4a;p=firefox-esr.git

Explicitly declare arrays

Otherwise this fails to compile on buster on i386.

Gbp-Pq: Topic porting
Gbp-Pq: Name build-i386-mismatched-type-unsigned-long-int.patch
---

diff --git a/toolkit/components/telemetry/tests/gtest/TestCombinedStacks.cpp b/toolkit/components/telemetry/tests/gtest/TestCombinedStacks.cpp
index 3e21c7378c3..284f35bda14 100644
--- a/toolkit/components/telemetry/tests/gtest/TestCombinedStacks.cpp
+++ b/toolkit/components/telemetry/tests/gtest/TestCombinedStacks.cpp
@@ -86,11 +86,15 @@ TEST(CombinedStacks, Combine)
   //     01 <no module>+3000
   //     02 modZ+2000
   //     03 base+4000
+  uintptr_t args1[] = {100, 200, 300};
+  uintptr_t args2[] = {1000, 2000, 3000};
+  uintptr_t args3[] = {100, 200, 300, 400};
+  uintptr_t args4[] = {1000, 2000, 3000, 4000};
   const ProcessedStack testStacks[] = {
-      MakeStack(moduleSet1, {100ul, 200ul, 300ul}),
-      MakeStack(moduleSet1, {1000ul, 2000ul, 3000ul}),
-      MakeStack(moduleSet2, {100ul, 200ul, 300ul, 400ul}),
-      MakeStack(moduleSet2, {1000ul, 2000ul, 3000ul, 4000ul}),
+      MakeStack(moduleSet1, args1),
+      MakeStack(moduleSet1, args2),
+      MakeStack(moduleSet2, args3),
+      MakeStack(moduleSet2, args4),
   };
 
   // combined1 <-- testStacks[0] + testStacks[1]