| Index: src/trusted/service_runtime/sel_main_chrome.c
|
| diff --git a/src/trusted/service_runtime/sel_main_chrome.c b/src/trusted/service_runtime/sel_main_chrome.c
|
| index 3c333ce904b95bd70fc066c605c6369ab4c4461b..45985871674469596fe4350bc7d84899c130afc7 100644
|
| --- a/src/trusted/service_runtime/sel_main_chrome.c
|
| +++ b/src/trusted/service_runtime/sel_main_chrome.c
|
| @@ -311,13 +311,10 @@ static int LoadApp(struct NaClApp *nap, struct NaClChromeMainArgs *args) {
|
| }
|
|
|
| if (args->enable_debug_stub) {
|
| +#if NACL_LINUX || NACL_OSX
|
| if (args->debug_stub_pipe_fd != NACL_INVALID_HANDLE) {
|
| NaClDebugStubSetPipe(args->debug_stub_pipe_fd);
|
| - }
|
| -
|
| -#if NACL_LINUX || NACL_OSX
|
| - if (args->debug_stub_pipe_fd == NACL_INVALID_HANDLE &&
|
| - args->debug_stub_server_bound_socket_fd != NACL_INVALID_SOCKET) {
|
| + } else if (args->debug_stub_server_bound_socket_fd != NACL_INVALID_SOCKET) {
|
| NaClDebugSetBoundSocket(args->debug_stub_server_bound_socket_fd);
|
| }
|
| #endif
|
| @@ -325,8 +322,7 @@ static int LoadApp(struct NaClApp *nap, struct NaClChromeMainArgs *args) {
|
| goto error;
|
| }
|
| #if NACL_WINDOWS
|
| - if (args->debug_stub_pipe_fd == NACL_INVALID_HANDLE &&
|
| - NULL != args->debug_stub_server_port_selected_handler_func) {
|
| + if (NULL != args->debug_stub_server_port_selected_handler_func) {
|
| args->debug_stub_server_port_selected_handler_func(
|
| NaClDebugGetBoundPort());
|
| }
|
|
|