diff options
| author | Jack Lloyd <[email protected]> | 2017-09-04 08:23:08 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-09-04 08:23:08 -0400 |
| commit | 16e5a43a77eeb5f2c23362309ca59fb011fc62bc (patch) | |
| tree | 0edf964f722f4a011fa793eaa1fb94776748fdca | |
| parent | f4b73e69f6a8213716d5aac202db7566111da157 (diff) | |
Header shuffle
Still need basic system headers even when using asio for network
| -rw-r--r-- | src/lib/utils/os_utils.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
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 |