https://github.com/ashgti created https://github.com/llvm/llvm-project/pull/125156
A previous change is triggering a failure due to SOCKET not being defined in IOStream.h. Adjusting the Windows includes to correct the imports and using a more narrow import (winsock2.h vs windows.h). Also removed a stale comment. Tested this on an x86_64 wins 11 vm. >From 35baa052e3051570c658af94797d16677ab9509d Mon Sep 17 00:00:00 2001 From: John Harrison <harj...@google.com> Date: Thu, 30 Jan 2025 20:07:09 -0800 Subject: [PATCH] [lldb-dap] Fix build failure on Windows. A previous change is triggering a failure due to SOCKET not being defined in IOStream.h. Adjusting the Windows includes to correct the imports and using a more narrow import (winsock2.h vs windows.h). Also removed a stale comment. --- lldb/tools/lldb-dap/IOStream.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lldb/tools/lldb-dap/IOStream.h b/lldb/tools/lldb-dap/IOStream.h index 74889eb2e5a866..c91b2f717893c8 100644 --- a/lldb/tools/lldb-dap/IOStream.h +++ b/lldb/tools/lldb-dap/IOStream.h @@ -10,13 +10,8 @@ #define LLDB_TOOLS_LLDB_DAP_IOSTREAM_H #if defined(_WIN32) -// We need to #define NOMINMAX in order to skip `min()` and `max()` macro -// definitions that conflict with other system headers. -// We also need to #undef GetObject (which is defined to GetObjectW) because -// the JSON code we use also has methods named `GetObject()` and we conflict -// against these. -#define NOMINMAX -#include <windows.h> +#include "lldb/Host/windows/windows.h" +#include <winsock2.h> #else typedef int SOCKET; #endif _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
