From 6c54bba6f6b0a7daa97a38b9829a978620d12804 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Sun, 16 Oct 2016 21:22:18 +0200
Subject: [PATCH] Fix MSVC

---
 test/testpaint/FunctionCall.cpp | 2 +-
 test/testpaint/String.cpp       | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/testpaint/FunctionCall.cpp b/test/testpaint/FunctionCall.cpp
index c0074f34c9..8d7973b8c7 100644
--- a/test/testpaint/FunctionCall.cpp
+++ b/test/testpaint/FunctionCall.cpp
@@ -34,7 +34,7 @@ bool FunctionCall::AssertsEquals(std::vector<function_call> expected, std::vecto
         return false;
     }
 
-    for (int i = 0; i < expected.size(); i++) {
+    for (size_t i = 0; i < expected.size(); i++) {
         function_call expectedCall = expected[i];
         function_call actualCall = actual[i];
 
diff --git a/test/testpaint/String.cpp b/test/testpaint/String.cpp
index 0189d9cd5a..6260e2870d 100644
--- a/test/testpaint/String.cpp
+++ b/test/testpaint/String.cpp
@@ -14,6 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
+#include <cstdarg>
+
 #include "String.hpp"
 
 namespace String {
@@ -21,11 +23,11 @@ namespace String {
     {
         va_list args;
         char buffer[512];
-    
+
         va_start(args, format);
         vsnprintf(buffer, sizeof(buffer), format, args);
         va_end(args);
-    
+
         return std::string(buffer);
     }
 };