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

Side by Side Diff: handler/main.cc

Issue 1424713008: win: Fix build after 2eeaa3ac549a (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Crashpad Authors. All rights reserved. 1 // Copyright 2014 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,
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 case kOptionResetOwnCrashExceptionPortToSystemDefault: { 179 case kOptionResetOwnCrashExceptionPortToSystemDefault: {
180 options.reset_own_crash_exception_port_to_system_default = true; 180 options.reset_own_crash_exception_port_to_system_default = true;
181 break; 181 break;
182 } 182 }
183 #elif defined(OS_WIN) 183 #elif defined(OS_WIN)
184 case kOptionHandshakeHandle: { 184 case kOptionHandshakeHandle: {
185 // Use unsigned int, because the handle was presented by the client in 185 // Use unsigned int, because the handle was presented by the client in
186 // 0x%x format. 186 // 0x%x format.
187 unsigned int handle_uint; 187 unsigned int handle_uint;
188 if (!StringToNumber(optarg, &handle_uint) || 188 if (!StringToNumber(optarg, &handle_uint) ||
189 (options.handshake_handle = IntToHandle(handle_uint)) == 189 (options.handshake_handle = IntToHandle(handle_uint)) ==
scottmg 2015/11/05 19:08:17 (Doesn't this assignment cause a warning?)
Mark Mentovai 2015/11/05 19:09:33 scottmg wrote:
190 INVALID_HANDLE_VALUE) { 190 INVALID_HANDLE_VALUE) {
191 ToolSupport::UsageHint(me, "--handshake-handle requires a HANDLE"); 191 ToolSupport::UsageHint(me, "--handshake-handle requires a HANDLE");
192 return EXIT_FAILURE; 192 return EXIT_FAILURE;
193 }
193 break; 194 break;
194 } 195 }
195 case kOptionPipeName: { 196 case kOptionPipeName: {
196 options.pipe_name = optarg; 197 options.pipe_name = optarg;
197 break; 198 break;
198 } 199 }
199 #endif // OS_MACOSX 200 #endif // OS_MACOSX
200 case kOptionURL: { 201 case kOptionURL: {
201 options.url = optarg; 202 options.url = optarg;
202 break; 203 break;
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 328
328 #if defined(OS_MACOSX) 329 #if defined(OS_MACOSX)
329 int main(int argc, char* argv[]) { 330 int main(int argc, char* argv[]) {
330 return crashpad::HandlerMain(argc, argv); 331 return crashpad::HandlerMain(argc, argv);
331 } 332 }
332 #elif defined(OS_WIN) 333 #elif defined(OS_WIN)
333 int wmain(int argc, wchar_t* argv[]) { 334 int wmain(int argc, wchar_t* argv[]) {
334 return crashpad::ToolSupport::Wmain(argc, argv, crashpad::HandlerMain); 335 return crashpad::ToolSupport::Wmain(argc, argv, crashpad::HandlerMain);
335 } 336 }
336 #endif // OS_MACOSX 337 #endif // OS_MACOSX
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698