From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 18 Apr 2023 15:06:50 +0000 (-0400)
Subject: common: hide asio header from common/error_code.h
X-Git-Tag: v19.0.0~216^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f479bbc4bc118989849fb663b5dcf5f46f05097d;p=ceph.git

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 <cbodley@redhat.com>
---

diff --git a/src/common/error_code.cc b/src/common/error_code.cc
index 60086c550aeb..ed0e681b22bf 100644
--- a/src/common/error_code.cc
+++ b/src/common/error_code.cc
@@ -15,6 +15,7 @@
 
 #include <exception>
 
+#include <boost/asio/error.hpp>
 #include "common/error_code.h"
 
 #pragma GCC diagnostic push
diff --git a/src/common/error_code.h b/src/common/error_code.h
index 6bcd8cb1791c..e39122f8ce31 100644
--- a/src/common/error_code.h
+++ b/src/common/error_code.h
@@ -18,8 +18,7 @@
 
 #include <netdb.h>
 
-#include <boost/system/error_code.hpp>
-#include <boost/asio.hpp>
+#include <boost/system.hpp>
 
 #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 2fd076808ac7..70a18c25dc31 100644
--- a/src/common/pick_address.cc
+++ b/src/common/pick_address.cc
@@ -17,6 +17,12 @@
 #include <bitset>
 #include <netdb.h>
 #include <netinet/in.h>
+#ifdef _WIN32
+#include <ws2ipdef.h>
+#else
+#include <arpa/inet.h> // inet_pton()
+#include <net/if.h> // IFF_UP
+#endif
 #include <string>
 #include <string.h>
 #include <vector>