From 9e7861b0b48299fb570e74f8d43fd5d76e7999fe Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Tue, 25 Nov 2025 20:00:10 -0500 Subject: [PATCH] Add #undef _res after including resolv.h to prevent macro conflicts (#2280) * Initial plan * Add #undef _res after including resolv.h to prevent macro conflicts Co-authored-by: yhirose <357397+yhirose@users.noreply.github.com> * Complete task - added #undef _res after resolv.h include Co-authored-by: yhirose <357397+yhirose@users.noreply.github.com> * Remove accidentally committed codeql build artifacts Co-authored-by: yhirose <357397+yhirose@users.noreply.github.com> * Add inline comment explaining why #undef _res is necessary Co-authored-by: yhirose <357397+yhirose@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: yhirose <357397+yhirose@users.noreply.github.com> --- httplib.h | 1 + 1 file changed, 1 insertion(+) diff --git a/httplib.h b/httplib.h index 7b07522..1049cc2 100644 --- a/httplib.h +++ b/httplib.h @@ -257,6 +257,7 @@ using socklen_t = int; #include #ifdef __linux__ #include +#undef _res // Undefine _res macro to avoid conflicts with user code (#2278) #endif #include #include