Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(70)

Side by Side Diff: third_party/crashpad/crashpad/handler/main.cc

Issue 2814043003: Update Crashpad to 1f28a123a4c9449e3d7ddad4ff00dacd366d5216 (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Crashpad Authors. All rights reserved. 1 // Copyright 2015 The Crashpad Authors. All rights reserved.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 // See the License for the specific language governing permissions and 12 // See the License for the specific language governing permissions and
13 // limitations under the License. 13 // limitations under the License.
14 14
15 #include "handler/handler_main.h" 15 #include "handler/handler_main.h"
16 16
17 #include "build/build_config.h" 17 #include "build/build_config.h"
18 #include "tools/tool_support.h" 18 #include "tools/tool_support.h"
19 19
20 #if defined(OS_WIN) 20 #if defined(OS_WIN)
21 #include <windows.h> 21 #include <windows.h>
22 #endif 22 #endif
23 23
24 #if defined(OS_MACOSX) 24 #if defined(OS_MACOSX)
25 int main(int argc, char* argv[]) { 25 int main(int argc, char* argv[]) {
26 return crashpad::HandlerMain(argc, argv); 26 return crashpad::HandlerMain(argc, argv, nullptr);
27 } 27 }
28 #elif defined(OS_WIN) 28 #elif defined(OS_WIN)
29 namespace {
30
31 int HandlerMainAdaptor(int argc, char* argv[]) {
32 return crashpad::HandlerMain(argc, argv, nullptr);
33 }
34
35 } // namespace
36
29 int APIENTRY wWinMain(HINSTANCE, HINSTANCE, wchar_t*, int) { 37 int APIENTRY wWinMain(HINSTANCE, HINSTANCE, wchar_t*, int) {
30 return crashpad::ToolSupport::Wmain(__argc, __wargv, crashpad::HandlerMain); 38 return crashpad::ToolSupport::Wmain(__argc, __wargv, HandlerMainAdaptor);
31 } 39 }
32 #endif // OS_MACOSX 40 #endif // OS_MACOSX
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698