3 files changed, 10 insertions, 10 deletions
diff --git a/src/processor/dump_context.cc b/src/processor/dump_context.cc
index 612556a2..49fb77b1 100644
--- a/src/processor/dump_context.cc
+++ b/src/processor/dump_context.cc
@@ -38,9 +38,9 @@
 
 #ifdef _WIN32
 #include <io.h>
-#define PRIx64 "llx"
-#define PRIx32 "lx"
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf
+#endif
 #else  // _WIN32
 #include <unistd.h>
 #endif  // _WIN32
diff --git a/src/processor/minidump.cc b/src/processor/minidump.cc
index 85ec6b9c..f2240026 100644
--- a/src/processor/minidump.cc
+++ b/src/processor/minidump.cc
@@ -44,9 +44,9 @@
 
 #ifdef _WIN32
 #include <io.h>
-#define PRIx64 "llx"
-#define PRIx32 "lx"
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf
+#endif
 #else  // _WIN32
 #include <unistd.h>
 #endif  // _WIN32
diff --git a/src/processor/proc_maps_linux.cc b/src/processor/proc_maps_linux.cc
index ed185712..0cd3772e 100644
--- a/src/processor/proc_maps_linux.cc
+++ b/src/processor/proc_maps_linux.cc
@@ -34,16 +34,16 @@ bool ParseProcMaps(const std::string& input,
 
   // Split the string by newlines.
   std::vector<std::string> lines;
-  std::string line = "";
+  std::string l = "";
   for (size_t i = 0; i < input.size(); i++) {
     if (input[i] != '\n' && input[i] != '\r') {
-      line.push_back(input[i]);
-    } else if (line.size() > 0) {
-      lines.push_back(line);
-      line.clear();
+      l.push_back(input[i]);
+    } else if (l.size() > 0) {
+      lines.push_back(l);
+      l.clear();
     }
   }
-  if (line.size() > 0) {
+  if (l.size() > 0) {
     BPLOG(ERROR) << "Input doesn't end in newline";
     return false;
   }