From 46359276c8c72c56e4103c90be22bbfda32c942d Mon Sep 17 00:00:00 2001 From: Yunxiao Ma Date: Tue, 5 Apr 2016 15:45:30 -0400 Subject: 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 | 43 --------------------------------- src/common/stdio_wrapper.h | 43 +++++++++++++++++++++++++++++++++ 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 +- 8 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 src/common/stdio.h create mode 100644 src/common/stdio_wrapper.h (limited to 'src') diff --git a/src/common/stdio.h b/src/common/stdio.h deleted file mode 100644 index 1eec8a00..00000000 --- a/src/common/stdio.h +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) 2016, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (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 - -#include - -#if defined(_MSC_VER) && MSC_VER < 1900 -#include - -#define snprintf _snprintf -typedef SSIZE_T ssize_t; -#endif - - -#endif // GOOGLE_BREAKPAD_COMMON_STDIO_H diff --git a/src/common/stdio_wrapper.h b/src/common/stdio_wrapper.h new file mode 100644 index 00000000..a3dd50aa --- /dev/null +++ b/src/common/stdio_wrapper.h @@ -0,0 +1,43 @@ +// Copyright (c) 2016, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (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_WRAPPER_H +#define GOOGLE_BREAKPAD_COMMON_STDIO_WRAPPER_H + +#include + +#if defined(_MSC_VER) && MSC_VER < 1900 +#include + +#define snprintf _snprintf +typedef SSIZE_T ssize_t; +#endif + + +#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" -- cgit v1.2.1