Skip to content

Commit 5c402fd

Browse files
committed
Fix cygwin build.
1 parent 5963b46 commit 5c402fd

File tree

13 files changed

+67
-84
lines changed

13 files changed

+67
-84
lines changed

include/boost/asio/detail/config.hpp

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@
720720
#endif // !defined(BOOST_ASIO_WINDOWS)
721721

722722
// Windows: target OS version.
723-
#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
723+
#if defined(BOOST_ASIO_WINDOWS)
724724
# if !defined(_WIN32_WINNT) && !defined(_WIN32_WINDOWS)
725725
# if defined(_MSC_VER) || (defined(__BORLANDC__) && !defined(__clang__))
726726
# pragma message( \
@@ -753,15 +753,10 @@
753753
# endif // !defined(_WINSOCK2API_)
754754
# endif // defined(__WIN32__) && !defined(WIN32)
755755
# endif // defined(__BORLANDC__)
756-
# if defined(__CYGWIN__)
757-
# if !defined(__USE_W32_SOCKETS)
758-
# error You must add -D__USE_W32_SOCKETS to your compiler options.
759-
# endif // !defined(__USE_W32_SOCKETS)
760-
# endif // defined(__CYGWIN__)
761756
#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
762757

763758
// Windows: minimise header inclusion.
764-
#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
759+
#if defined(BOOST_ASIO_WINDOWS)
765760
# if !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN)
766761
# if !defined(WIN32_LEAN_AND_MEAN)
767762
# define WIN32_LEAN_AND_MEAN
@@ -770,7 +765,7 @@
770765
#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
771766

772767
// Windows: suppress definition of "min" and "max" macros.
773-
#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
768+
#if defined(BOOST_ASIO_WINDOWS)
774769
# if !defined(BOOST_ASIO_NO_NOMINMAX)
775770
# if !defined(NOMINMAX)
776771
# define NOMINMAX 1
@@ -780,7 +775,7 @@
780775

781776
// Windows: IO Completion Ports.
782777
#if !defined(BOOST_ASIO_HAS_IOCP)
783-
# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
778+
# if defined(BOOST_ASIO_WINDOWS)
784779
# if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400)
785780
# if !defined(UNDER_CE) && !defined(BOOST_ASIO_WINDOWS_APP)
786781
# if !defined(BOOST_ASIO_DISABLE_IOCP)
@@ -882,8 +877,7 @@
882877
#if !defined(BOOST_ASIO_HAS_SERIAL_PORT)
883878
# if defined(BOOST_ASIO_HAS_IOCP) \
884879
|| !defined(BOOST_ASIO_WINDOWS) \
885-
&& !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
886-
&& !defined(__CYGWIN__)
880+
&& !defined(BOOST_ASIO_WINDOWS_RUNTIME)
887881
# if !defined(__SYMBIAN32__)
888882
# if !defined(BOOST_ASIO_DISABLE_SERIAL_PORT)
889883
# define BOOST_ASIO_HAS_SERIAL_PORT 1
@@ -916,7 +910,7 @@
916910
// Windows: object handles.
917911
#if !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE)
918912
# if !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE)
919-
# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
913+
# if defined(BOOST_ASIO_WINDOWS)
920914
# if !defined(UNDER_CE) && !defined(BOOST_ASIO_WINDOWS_APP)
921915
# define BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE 1
922916
# endif // !defined(UNDER_CE) && !defined(BOOST_ASIO_WINDOWS_APP)
@@ -937,8 +931,7 @@
937931
#if !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR)
938932
# if !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR)
939933
# if !defined(BOOST_ASIO_WINDOWS) \
940-
&& !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
941-
&& !defined(__CYGWIN__)
934+
&& !defined(BOOST_ASIO_WINDOWS_RUNTIME)
942935
# define BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR 1
943936
# endif // !defined(BOOST_ASIO_WINDOWS)
944937
// && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
@@ -970,8 +963,7 @@
970963
#if !defined(BOOST_ASIO_HAS_PIPE)
971964
# if defined(BOOST_ASIO_HAS_IOCP) \
972965
|| !defined(BOOST_ASIO_WINDOWS) \
973-
&& !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
974-
&& !defined(__CYGWIN__)
966+
&& !defined(BOOST_ASIO_WINDOWS_RUNTIME)
975967
# if !defined(__SYMBIAN32__)
976968
# if !defined(BOOST_ASIO_DISABLE_PIPE)
977969
# define BOOST_ASIO_HAS_PIPE 1
@@ -987,8 +979,7 @@
987979
#if !defined(BOOST_ASIO_HAS_SIGACTION)
988980
# if !defined(BOOST_ASIO_DISABLE_SIGACTION)
989981
# if !defined(BOOST_ASIO_WINDOWS) \
990-
&& !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
991-
&& !defined(__CYGWIN__)
982+
&& !defined(BOOST_ASIO_WINDOWS_RUNTIME)
992983
# define BOOST_ASIO_HAS_SIGACTION 1
993984
# endif // !defined(BOOST_ASIO_WINDOWS)
994985
// && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
@@ -1008,7 +999,7 @@
1008999
// Can use getaddrinfo() and getnameinfo().
10091000
#if !defined(BOOST_ASIO_HAS_GETADDRINFO)
10101001
# if !defined(BOOST_ASIO_DISABLE_GETADDRINFO)
1011-
# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
1002+
# if defined(BOOST_ASIO_WINDOWS)
10121003
# if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501)
10131004
# define BOOST_ASIO_HAS_GETADDRINFO 1
10141005
# elif defined(UNDER_CE)

include/boost/asio/detail/fd_set_adapter.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace boost {
2626
namespace asio {
2727
namespace detail {
2828

29-
#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
29+
#if defined(BOOST_ASIO_WINDOWS)
3030
typedef win_fd_set_adapter fd_set_adapter;
3131
#else
3232
typedef posix_fd_set_adapter fd_set_adapter;

include/boost/asio/detail/hash_map.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <boost/asio/detail/assert.hpp>
2222
#include <boost/asio/detail/noncopyable.hpp>
2323

24-
#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
24+
#if defined(BOOST_ASIO_WINDOWS)
2525
# include <boost/asio/detail/socket_types.hpp>
2626
#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
2727

@@ -42,7 +42,7 @@ inline std::size_t calculate_hash_value(void* p)
4242
+ (reinterpret_cast<std::size_t>(p) >> 3);
4343
}
4444

45-
#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
45+
#if defined(BOOST_ASIO_WINDOWS)
4646
inline std::size_t calculate_hash_value(SOCKET s)
4747
{
4848
return static_cast<std::size_t>(s);

include/boost/asio/detail/impl/null_event.ipp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#if defined(BOOST_ASIO_WINDOWS_RUNTIME)
2121
# include <thread>
22-
#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
22+
#elif defined(BOOST_ASIO_WINDOWS)
2323
# include <boost/asio/detail/socket_types.hpp>
2424
#else
2525
# include <unistd.h>
@@ -41,7 +41,7 @@ void null_event::do_wait()
4141
{
4242
#if defined(BOOST_ASIO_WINDOWS_RUNTIME)
4343
std::this_thread::sleep_until((std::chrono::steady_clock::time_point::max)());
44-
#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
44+
#elif defined(BOOST_ASIO_WINDOWS)
4545
::Sleep(INFINITE);
4646
#else
4747
::pause();
@@ -52,7 +52,7 @@ void null_event::do_wait_for_usec(long usec)
5252
{
5353
#if defined(BOOST_ASIO_WINDOWS_RUNTIME)
5454
std::this_thread::sleep_for(std::chrono::microseconds(usec));
55-
#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
55+
#elif defined(BOOST_ASIO_WINDOWS)
5656
::Sleep(usec / 1000);
5757
#elif defined(__hpux) && defined(__SELECT)
5858
timespec ts;

0 commit comments

Comments
 (0)