aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-10-03 15:19:02 -0400
committerJack Lloyd <[email protected]>2017-10-03 15:19:02 -0400
commit698b431ad9afbdd1da15c0219d88ee0bd3607df7 (patch)
treea1f67ae900ed25ef68be9629552a0a5a10a493a5 /src/lib
parentc7578d6724340bb0403012b8de5e1f52777050f8 (diff)
Simplify header includes in socket.cpp
This got a little contorted in os_utils.cpp because of need to support Boost asio along with system dependent interfaces. Here it's simple: Boost or Unix or Winsock.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/utils/http_util/socket.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/lib/utils/http_util/socket.cpp b/src/lib/utils/http_util/socket.cpp
index 0d94c9a8e..a2b9d5567 100644
--- a/src/lib/utils/http_util/socket.cpp
+++ b/src/lib/utils/http_util/socket.cpp
@@ -8,6 +8,7 @@
#include <botan/internal/socket.h>
#include <botan/exceptn.h>
+#include <botan/mem_ops.h>
#include <chrono>
#if defined(BOTAN_HAS_BOOST_ASIO)
@@ -18,26 +19,19 @@
*/
#define BOOST_ASIO_DISABLE_SERIAL_PORT
#include <boost/asio.hpp>
-#endif
-
-#if defined(BOTAN_TARGET_OS_TYPE_IS_UNIX)
-#if !defined(BOTAN_HAS_BOOST_ASIO)
+#elif defined(BOTAN_TARGET_OS_TYPE_IS_UNIX)
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
#include <string.h>
#include <unistd.h>
-#endif
+ #include <errno.h>
#elif defined(BOTAN_TARGET_OS_TYPE_IS_WINDOWS)
- #include <botan/mem_ops.h>
-
#define NOMINMAX 1
-#if !defined(BOTAN_HAS_BOOST_ASIO)
#include <winsock2.h>
#include <ws2tcpip.h>
-#endif
#include <windows.h>
#endif