From 16e5a43a77eeb5f2c23362309ca59fb011fc62bc Mon Sep 17 00:00:00 2001
From: Jack Lloyd <jack@randombit.net>
Date: Mon, 4 Sep 2017 08:23:08 -0400
Subject: Header shuffle

Still need basic system headers even when using asio for network
---
 src/lib/utils/os_utils.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'src/lib/utils')

diff --git a/src/lib/utils/os_utils.cpp b/src/lib/utils/os_utils.cpp
index bfb3fcfe3..297316152 100644
--- a/src/lib/utils/os_utils.cpp
+++ b/src/lib/utils/os_utils.cpp
@@ -1,6 +1,6 @@
 /*
 * OS and machine specific utility functions
-* (C) 2015,2016 Jack Lloyd
+* (C) 2015,2016,2017 Jack Lloyd
 * (C) 2016 Daniel Neus
 *
 * Botan is released under the Simplified BSD License (see license.txt)
@@ -13,7 +13,6 @@
 #include <chrono>
 
 #if defined(BOTAN_HAS_BOOST_ASIO)
-
   /*
   * We don't need serial port support anyway, and asking for it
   * causes macro conflicts with Darwin's termios.h when this
@@ -21,22 +20,28 @@
   */
   #define BOOST_ASIO_DISABLE_SERIAL_PORT
   #include <boost/asio.hpp>
+#endif
 
-#elif defined(BOTAN_TARGET_OS_TYPE_IS_UNIX)
+#if defined(BOTAN_TARGET_OS_TYPE_IS_UNIX)
   #include <sys/types.h>
-  #include <sys/mman.h>
   #include <sys/resource.h>
-  #include <unistd.h>
+  #include <sys/mman.h>
   #include <signal.h>
   #include <setjmp.h>
+  #include <unistd.h>
+
+#if !defined(BOTAN_HAS_BOOST_ASIO)
   #include <sys/socket.h>
   #include <netinet/in.h>
   #include <netdb.h>
+#endif
 
 #elif defined(BOTAN_TARGET_OS_TYPE_IS_WINDOWS)
   #define NOMINMAX 1
+#if !defined(BOTAN_HAS_BOOST_ASIO)
   #include <winsock2.h>
   #include <ws2tcpip.h>
+#endif
   #include <windows.h>
 #endif
 
-- 
cgit v1.2.3