--- a/js/src/jit/RematerializedFrame.h
+++ b/js/src/jit/RematerializedFrame.h
@@ -178,17 +178,17 @@ class RematerializedFrame
 
     unsigned numFormalArgs() const {
         return isFunctionFrame() ? callee()->nargs() : 0;
     }
     unsigned numActualArgs() const {
         return numActualArgs_;
     }
     unsigned numArgSlots() const {
-        return std::max(numFormalArgs(), numActualArgs());
+        return (std::max)(numFormalArgs(), numActualArgs());
     }
 
     Value* argv() {
         return slots_;
     }
     Value* locals() {
         return slots_ + numArgSlots() + isConstructing_;
     }