6 files changed, 7 insertions, 17 deletions
diff --git a/src/processor/dump_context.cc b/src/processor/dump_context.cc
index 49fb77b1..1c10b955 100644
--- a/src/processor/dump_context.cc
+++ b/src/processor/dump_context.cc
@@ -34,17 +34,14 @@
 #include "google_breakpad/processor/dump_context.h"
 
 #include <assert.h>
-#include <stdio.h>
 
 #ifdef _WIN32
 #include <io.h>
-#if defined(_MSC_VER) && _MSC_VER < 1900
-#define snprintf _snprintf
-#endif
 #else  // _WIN32
 #include <unistd.h>
 #endif  // _WIN32
 
+#include "common/stdio.h"
 #include "processor/logging.h"
 
 namespace google_breakpad {
diff --git a/src/processor/logging.cc b/src/processor/logging.cc
index 8bb95a69..06c5510c 100644
--- a/src/processor/logging.cc
+++ b/src/processor/logging.cc
@@ -35,20 +35,16 @@
 
 #include <assert.h>
 #include <errno.h>
-#include <stdio.h>
 #include <string.h>
 #include <time.h>
 
 #include <string>
 
+#include "common/stdio.h"
 #include "common/using_std_string.h"
 #include "processor/logging.h"
 #include "processor/pathname_stripper.h"
 
-#ifdef _WIN32
-#define snprintf _snprintf
-#endif
-
 namespace google_breakpad {
 
 LogStream::LogStream(std::ostream &stream, Severity severity,
diff --git a/src/processor/minidump.cc b/src/processor/minidump.cc
index ccc90d5a..a23a0165 100644
--- a/src/processor/minidump.cc
+++ b/src/processor/minidump.cc
@@ -38,15 +38,11 @@
 #include <assert.h>
 #include <fcntl.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <string.h>
 #include <time.h>
 
 #ifdef _WIN32
 #include <io.h>
-#if defined(_MSC_VER) && _MSC_VER < 1900
-#define snprintf _snprintf
-#endif
 #else  // _WIN32
 #include <unistd.h>
 #endif  // _WIN32
@@ -60,6 +56,7 @@
 #include "processor/range_map-inl.h"
 
 #include "common/scoped_ptr.h"
+#include "common/stdio.h"
 #include "google_breakpad/processor/dump_context.h"
 #include "processor/basic_code_module.h"
 #include "processor/basic_code_modules.h"
diff --git a/src/processor/minidump_processor.cc b/src/processor/minidump_processor.cc
index 3a20dfa5..78e98b8b 100644
--- a/src/processor/minidump_processor.cc
+++ b/src/processor/minidump_processor.cc
@@ -30,11 +30,11 @@
 #include "google_breakpad/processor/minidump_processor.h"
 
 #include <assert.h>
-#include <stdio.h>
 
 #include <string>
 
 #include "common/scoped_ptr.h"
+#include "common/stdio.h"
 #include "common/using_std_string.h"
 #include "google_breakpad/processor/call_stack.h"
 #include "google_breakpad/processor/minidump.h"
diff --git a/src/processor/stackwalk_common.cc b/src/processor/stackwalk_common.cc
index 3a6e17fe..dd529fdb 100644
--- a/src/processor/stackwalk_common.cc
+++ b/src/processor/stackwalk_common.cc
@@ -35,13 +35,13 @@
 #include "processor/stackwalk_common.h"
 
 #include <assert.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <string>
 #include <vector>
 
+#include "common/stdio.h"
 #include "common/using_std_string.h"
 #include "google_breakpad/processor/call_stack.h"
 #include "google_breakpad/processor/code_module.h"
diff --git a/src/processor/symbolic_constants_win.cc b/src/processor/symbolic_constants_win.cc
index 333aa041..adb0cc0a 100644
--- a/src/processor/symbolic_constants_win.cc
+++ b/src/processor/symbolic_constants_win.cc
@@ -33,9 +33,9 @@
 //
 // Author: Ben Wagner
 
-#include <cstdio>
 #include <string>
 
+#include "common/stdio.h"
 #include "google_breakpad/common/breakpad_types.h"
 #include "google_breakpad/common/minidump_exception_win32.h"
 #include "processor/symbolic_constants_win.h"
@@ -6406,7 +6406,7 @@ std::string NTStatusToString(uint32_t ntstatus) {
       break;
     default: {
       char reason_string[11];
-      std::snprintf(reason_string, sizeof(reason_string), "0x%08x", ntstatus);
+      snprintf(reason_string, sizeof(reason_string), "0x%08x", ntstatus);
       reason = reason_string;
       break;
     }