From 68095b6a4e6148125fe631c63469496d2afca29c Mon Sep 17 00:00:00 2001 From: Scott Graham Date: Thu, 17 Nov 2016 14:18:06 -0800 Subject: [PATCH] Don't LOG(ERROR) for usage, and fix VS2013 build after 8b3eec8 R=mark@chromium.org BUG=crashpad:57 Change-Id: I6514a82ae5de38a695422ef86c044ec3b2ce171b Reviewed-on: https://chromium-review.googlesource.com/412269 Reviewed-by: Mark Mentovai --- client/crashpad_client_win.cc | 2 +- handler/win/crashy_signal.cc | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/client/crashpad_client_win.cc b/client/crashpad_client_win.cc index 6f93f7ae..0eee1857 100644 --- a/client/crashpad_client_win.cc +++ b/client/crashpad_client_win.cc @@ -546,7 +546,7 @@ void RegisterHandlers() { // expect it to cause a crash dump. This will only work when the abort() // that's called in client code is the same (or has the same behavior) as the // one in use here. - _crt_signal_t rv = signal(SIGABRT, HandleAbortSignal); + void (*rv)(int) = signal(SIGABRT, HandleAbortSignal); DCHECK_NE(rv, SIG_ERR); } diff --git a/handler/win/crashy_signal.cc b/handler/win/crashy_signal.cc index 634bce8c..8caa6259 100644 --- a/handler/win/crashy_signal.cc +++ b/handler/win/crashy_signal.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include #include #include #include "base/logging.h" -#include "base/strings/utf_string_conversions.h" #include "client/crashpad_client.h" namespace crashpad { @@ -52,8 +52,7 @@ int CrashySignalMain(int argc, wchar_t* argv[]) { return EXIT_FAILURE; } } else { - LOG(ERROR) << "Usage: " << base::UTF16ToUTF8(argv[0]) - << " main|background"; + fprintf(stderr, "Usage: %ls main|background\n", argv[0]); return EXIT_FAILURE; }