From f479bbc4bc118989849fb663b5dcf5f46f05097d Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 18 Apr 2023 11:06:50 -0400 Subject: [PATCH] common: hide asio header from common/error_code.h this added a dependency on uring headers where it wasn't necessary. pick_address.cc was relying on that for the IFF_UP define Signed-off-by: Casey Bodley --- src/common/error_code.cc | 1 + src/common/error_code.h | 3 +-- src/common/pick_address.cc | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/common/error_code.cc b/src/common/error_code.cc index 60086c550ae..ed0e681b22b 100644 --- a/src/common/error_code.cc +++ b/src/common/error_code.cc @@ -15,6 +15,7 @@ #include +#include #include "common/error_code.h" #pragma GCC diagnostic push diff --git a/src/common/error_code.h b/src/common/error_code.h index 6bcd8cb1791..e39122f8ce3 100644 --- a/src/common/error_code.h +++ b/src/common/error_code.h @@ -18,8 +18,7 @@ #include -#include -#include +#include #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" diff --git a/src/common/pick_address.cc b/src/common/pick_address.cc index 2fd076808ac..70a18c25dc3 100644 --- a/src/common/pick_address.cc +++ b/src/common/pick_address.cc @@ -17,6 +17,12 @@ #include #include #include +#ifdef _WIN32 +#include +#else +#include // inet_pton() +#include // IFF_UP +#endif #include #include #include -- 2.39.5