From 8dd6064fc9b408a52948d633172d206ec9a36a85 Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Wed, 17 May 2017 13:06:22 -0400
Subject: [PATCH] Bug 1360321 - 4e. Fix std::min type error; r=froydnj
 r=glandium

Specify the same type for std::min arguments to avoid the error.

MozReview-Commit-ID: C7yHu7c1s34
---
 mozglue/linker/XZStream.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mozglue/linker/XZStream.cpp b/mozglue/linker/XZStream.cpp
index bd71655f52c7..30f3a32caa68 100644
--- a/mozglue/linker/XZStream.cpp
+++ b/mozglue/linker/XZStream.cpp
@@ -18,7 +18,7 @@ ParseVarLenInt(const uint8_t* aBuf, size_t aBufSize, uint64_t* aValue)
   if (!aBufSize) {
     return 0;
   }
-  aBufSize = std::min(9u, aBufSize);
+  aBufSize = std::min(size_t(9), aBufSize);
 
   *aValue = aBuf[0] & 0x7F;
   size_t i = 0;