forked from OSchip/llvm-project
				
			
							parent
							
								
									9344787636
								
							
						
					
					
						commit
						b36da43dc3
					
				| 
						 | 
					@ -1380,7 +1380,7 @@ ConnectionFileDescriptor::SocketListen (const char *host_and_port, Error *error_
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            struct sockaddr_in accept_addr;
 | 
					            struct sockaddr_in accept_addr;
 | 
				
			||||||
            ::memset (&accept_addr, 0, sizeof accept_addr);
 | 
					            ::memset (&accept_addr, 0, sizeof accept_addr);
 | 
				
			||||||
#ifndef __linux__
 | 
					#if !(defined (__linux__) || defined(_MSC_VER))
 | 
				
			||||||
            accept_addr.sin_len = sizeof accept_addr;
 | 
					            accept_addr.sin_len = sizeof accept_addr;
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
            socklen_t accept_addr_len = sizeof accept_addr;
 | 
					            socklen_t accept_addr_len = sizeof accept_addr;
 | 
				
			||||||
| 
						 | 
					@ -1402,7 +1402,7 @@ ConnectionFileDescriptor::SocketListen (const char *host_and_port, Error *error_
 | 
				
			||||||
            else
 | 
					            else
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                if (
 | 
					                if (
 | 
				
			||||||
#ifndef __linux__
 | 
					#if !(defined(__linux__) || (defined(_MSC_VER)))
 | 
				
			||||||
                    accept_addr_len == listen_addr.sockaddr_in().sin_len &&
 | 
					                    accept_addr_len == listen_addr.sockaddr_in().sin_len &&
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
                    accept_addr.sin_addr.s_addr == listen_addr.sockaddr_in().sin_addr.s_addr)
 | 
					                    accept_addr.sin_addr.s_addr == listen_addr.sockaddr_in().sin_addr.s_addr)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,12 +13,12 @@
 | 
				
			||||||
#include <errno.h>
 | 
					#include <errno.h>
 | 
				
			||||||
#include <limits.h>
 | 
					#include <limits.h>
 | 
				
			||||||
#include <sys/types.h>
 | 
					#include <sys/types.h>
 | 
				
			||||||
#include <unistd.h>
 | 
					 | 
				
			||||||
#ifdef _WIN32
 | 
					#ifdef _WIN32
 | 
				
			||||||
#include "lldb/Host/windows/windows.h"
 | 
					#include "lldb/Host/windows/windows.h"
 | 
				
			||||||
#include <winsock2.h>
 | 
					#include <winsock2.h>
 | 
				
			||||||
#include <WS2tcpip.h>
 | 
					#include <WS2tcpip.h>
 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
 | 
					#include <unistd.h>
 | 
				
			||||||
#include <dlfcn.h>
 | 
					#include <dlfcn.h>
 | 
				
			||||||
#include <grp.h>
 | 
					#include <grp.h>
 | 
				
			||||||
#include <netdb.h>
 | 
					#include <netdb.h>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -694,7 +694,11 @@ GDBRemoteCommunication::StartDebugserverProcess (const char *hostname,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                if (::mktemp (named_pipe_path))
 | 
					                if (::mktemp (named_pipe_path))
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
 | 
					#if defined(_MSC_VER)
 | 
				
			||||||
 | 
					                    if ( false )
 | 
				
			||||||
 | 
					#else
 | 
				
			||||||
                    if (::mkfifo(named_pipe_path, 0600) == 0)
 | 
					                    if (::mkfifo(named_pipe_path, 0600) == 0)
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
                    {
 | 
					                    {
 | 
				
			||||||
                        debugserver_args.AppendArgument("--named-pipe");
 | 
					                        debugserver_args.AppendArgument("--named-pipe");
 | 
				
			||||||
                        debugserver_args.AppendArgument(named_pipe_path);
 | 
					                        debugserver_args.AppendArgument(named_pipe_path);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue