From 46359276c8c72c56e4103c90be22bbfda32c942d Mon Sep 17 00:00:00 2001 From: Yunxiao Ma Date: Tue, 5 Apr 2016 15:45:30 -0400 Subject: [PATCH] Rename stdio.h wrapper file to stdio_wrapper.h. Some projects will get build break because the comipler is confused when searches for the standard stdio.h. Rename the wrapper file to avoid that. renamed: src/common/stdio.h -> src/common/stdio_wrapper.h modified: src/processor/minidump.cc modified: src/processor/dump_context.cc modified: src/processor/logging.cc modified: src/processor/minidump.cc modified: src/processor/minidump_processor.cc modified: src/processor/stackwalk_common.cc modified: src/processor/symbolic_constants_win.cc R=mark@chromium.org, labath@google.com Review URL: https://codereview.chromium.org/1864603002 . Patch from Yunxiao Ma . --- src/common/{stdio.h => stdio_wrapper.h} | 6 +++--- src/processor/dump_context.cc | 2 +- src/processor/logging.cc | 2 +- src/processor/minidump.cc | 2 +- src/processor/minidump_processor.cc | 2 +- src/processor/stackwalk_common.cc | 2 +- src/processor/symbolic_constants_win.cc | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) rename src/common/{stdio.h => stdio_wrapper.h} (92%) diff --git a/src/common/stdio.h b/src/common/stdio_wrapper.h similarity index 92% rename from src/common/stdio.h rename to src/common/stdio_wrapper.h index 1eec8a00..a3dd50aa 100644 --- a/src/common/stdio.h +++ b/src/common/stdio_wrapper.h @@ -27,8 +27,8 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef GOOGLE_BREAKPAD_COMMON_STDIO_H -#define GOOGLE_BREAKPAD_COMMON_STDIO_H +#ifndef GOOGLE_BREAKPAD_COMMON_STDIO_WRAPPER_H +#define GOOGLE_BREAKPAD_COMMON_STDIO_WRAPPER_H #include @@ -40,4 +40,4 @@ typedef SSIZE_T ssize_t; #endif -#endif // GOOGLE_BREAKPAD_COMMON_STDIO_H +#endif // GOOGLE_BREAKPAD_COMMON_STDIO_WRAPPER_H diff --git a/src/processor/dump_context.cc b/src/processor/dump_context.cc index 33b02cb6..762d4fe2 100644 --- a/src/processor/dump_context.cc +++ b/src/processor/dump_context.cc @@ -41,7 +41,7 @@ #include #endif // _WIN32 -#include "common/stdio.h" +#include "common/stdio_wrapper.h" #include "processor/logging.h" namespace google_breakpad { diff --git a/src/processor/logging.cc b/src/processor/logging.cc index 06c5510c..c1eebbc2 100644 --- a/src/processor/logging.cc +++ b/src/processor/logging.cc @@ -40,7 +40,7 @@ #include -#include "common/stdio.h" +#include "common/stdio_wrapper.h" #include "common/using_std_string.h" #include "processor/logging.h" #include "processor/pathname_stripper.h" diff --git a/src/processor/minidump.cc b/src/processor/minidump.cc index 90311376..8b66f7c4 100644 --- a/src/processor/minidump.cc +++ b/src/processor/minidump.cc @@ -57,7 +57,7 @@ #include "processor/range_map-inl.h" #include "common/scoped_ptr.h" -#include "common/stdio.h" +#include "common/stdio_wrapper.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 448152a8..06a8916d 100644 --- a/src/processor/minidump_processor.cc +++ b/src/processor/minidump_processor.cc @@ -34,7 +34,7 @@ #include #include "common/scoped_ptr.h" -#include "common/stdio.h" +#include "common/stdio_wrapper.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 58ba6bda..d8950fe2 100644 --- a/src/processor/stackwalk_common.cc +++ b/src/processor/stackwalk_common.cc @@ -41,7 +41,7 @@ #include #include -#include "common/stdio.h" +#include "common/stdio_wrapper.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 adb0cc0a..8f142a76 100644 --- a/src/processor/symbolic_constants_win.cc +++ b/src/processor/symbolic_constants_win.cc @@ -35,7 +35,7 @@ #include -#include "common/stdio.h" +#include "common/stdio_wrapper.h" #include "google_breakpad/common/breakpad_types.h" #include "google_breakpad/common/minidump_exception_win32.h" #include "processor/symbolic_constants_win.h"